snap

.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

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

.github/mergeable.yml

@@ -16,11 +16,11 @@ mergeable:
                 required: ['CHANGELOG.md']
             - do: dependent
               changed:
-                file: 'deltachat-ffi/src/**'
+                file: 'deltachat-ffi/**'
                 required: ['CHANGELOG.md']
     fail:
       - do: checks
         status: 'action_required' 
         payload:
-          title: Changelog might need an update
+          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

@@ -10,14 +10,14 @@ on:
 
 env:
   RUSTFLAGS: -Dwarnings
-   
+
 jobs:
 
   fmt:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -26,12 +26,15 @@ jobs:
       - run: rustup component add rustfmt
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v1
-      - run: cargo fmt --all -- --check
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
 
   run_clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
             toolchain: stable
@@ -42,7 +45,7 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --workspace --tests --examples --benches --features repl -- -D warnings
+          args: --workspace --tests --examples --benches
 
   docs:
     name: Rust doc comments
@@ -51,7 +54,7 @@ jobs:
       RUSTDOCFLAGS: -Dwarnings
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: Install rust stable toolchain
         uses: actions-rs/toolchain@v1
         with:
@@ -62,7 +65,10 @@ jobs:
       - name: Cache rust cargo artifacts
         uses: swatinem/rust-cache@v1
       - name: Rustdoc
-        run: cargo doc --document-private-items --no-deps
+        uses: actions-rs/cargo@v1
+        with:
+          command: doc
+          args: --document-private-items --no-deps
 
   build_and_test:
     name: Build and test
@@ -71,19 +77,19 @@ jobs:
         include:
           # Currently used Rust version, same as in `rust-toolchain` file.
           - os: ubuntu-latest
-            rust: 1.64.0
+            rust: 1.60.0
             python: 3.9
           - os: windows-latest
-            rust: 1.64.0
+            rust: 1.60.0
             python: false # Python bindings compilation on Windows is not supported.
 
-          # Minimum Supported Rust Version = 1.61.0
+          # 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.
           - os: ubuntu-latest
-            rust: 1.61.0
+            rust: 1.56.0
             python: 3.7
     runs-on: ${{ matrix.os }}
     steps:
@@ -99,17 +105,20 @@ jobs:
       uses: swatinem/rust-cache@v1
 
     - name: check
-      run: cargo check --all --bins --examples --tests --features repl --benches
+      uses: actions-rs/cargo@v1
+      with:
+        command: check
+        args: --all --bins --examples --tests --features repl --benches
 
     - name: tests
-      run: cargo test --all
-
-    - name: test cargo vendor
-      run: cargo vendor
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --all
 
     - name: install python
       if: ${{ matrix.python }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python }}
 
@@ -119,7 +128,10 @@ jobs:
 
     - name: build C library
       if: ${{ matrix.python }}
-      run: cargo build -p deltachat_ffi --features jsonrpc
+      uses: actions-rs/cargo@v1
+      with:
+        command: build
+        args: -p deltachat_ffi
 
     - name: run python tests
       if: ${{ matrix.python }}
@@ -129,33 +141,3 @@ jobs:
         DCC_RS_DEV: ${{ github.workspace }}
       working-directory: python
       run: tox -e lint,mypy,doc,py3
-
-    - name: build deltachat-rpc-server
-      if: ${{ matrix.python }}
-      run: cargo build -p deltachat-rpc-server
-
-    - name: add deltachat-rpc-server to path
-      if: ${{ matrix.python }}
-      run: echo ${{ github.workspace }}/target/debug >> $GITHUB_PATH
-
-    - name: run deltachat-rpc-client tests
-      if: ${{ matrix.python }}
-      env:
-        DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-      working-directory: deltachat-rpc-client
-      run: tox -e py3
-
-    - name: install pypy
-      if: ${{ matrix.python }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: 'pypy${{ matrix.python }}'
-
-    - name: run pypy 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 pypy3

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

@@ -1,83 +0,0 @@
-name: 'jsonrpc js client build'
-on:
-  pull_request:
-  push:
-    tags:
-    - '*'
-    - '!py-*'
-
-
-jobs:
-  pack-module:
-    name: 'Package @deltachat/jsonrpc-client and upload to download.delta.chat'
-    runs-on: ubuntu-18.04
-    steps:
-      - name: install tree
-        run: sudo apt install tree
-      - name: Checkout
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-      - name: get tag
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-        continue-on-error: true
-      - name: Get Pullrequest ID
-        id: prepare
-        run: |
-          tag=${{ steps.tag.outputs.tag }}
-          if [ -z "$tag" ]; then
-            node -e "console.log('DELTACHAT_JSONRPC_TAR_GZ=deltachat-jsonrpc-client-' + '${{ github.ref }}'.split('/')[2] + '.tar.gz')" >> $GITHUB_ENV
-          else
-            echo "DELTACHAT_JSONRPC_TAR_GZ=deltachat-jsonrpc-client-${{ steps.tag.outputs.tag }}.tar.gz" >> $GITHUB_ENV
-            echo "No preview will be uploaded this time, but the $tag release"
-          fi
-      - name: System info
-        run: |
-          npm --version
-          node --version
-          echo $DELTACHAT_JSONRPC_TAR_GZ
-      - name: install dependencies without running scripts
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm install --ignore-scripts
-      - name: package
-        shell: bash
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm run build
-          npm pack .
-          ls -lah
-          mv $(find deltachat-jsonrpc-client-*) $DELTACHAT_JSONRPC_TAR_GZ
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-jsonrpc-client.tgz
-          path: deltachat-jsonrpc/typescript/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
-      # Upload to download.delta.chat/node/preview/
-      - name: Upload deltachat-jsonrpc-client preview to download.delta.chat/node/preview/
-        if: ${{ ! steps.tag.outputs.tag }}
-        id: upload-preview
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r deltachat-jsonrpc/typescript/$DELTACHAT_JSONRPC_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/preview/"
-        continue-on-error: true
-      - name: "Post links to details"
-        if: steps.upload-preview.outcome == 'success'
-        run: node ./node/scripts/postLinksToDetails.js
-        env:
-         URL: preview/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-         MSG_CONTEXT: Download the deltachat-jsonrpc-client.tgz
-      # Upload to download.delta.chat/node/
-      - name: Upload deltachat-jsonrpc-client build to download.delta.chat/node/
-        if: ${{ steps.tag.outputs.tag }}
-        id: upload
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r deltachat-jsonrpc/typescript/$DELTACHAT_JSONRPC_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/"

.github/workflows/jsonrpc.yml

@@ -1,46 +0,0 @@
-name: JSON-RPC API Test
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-env:
-  CARGO_TERM_COLOR: always
-  RUST_MIN_STACK: "8388608"
-
-jobs:
-  build_and_test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js 16.x
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - name: Add Rust cache
-        uses: Swatinem/rust-cache@v1.3.0
-      - name: npm install
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm install
-      - name: Build TypeScript, run Rust tests, generate bindings
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm run build
-      - name: Run integration tests
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm run test
-        env:
-          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-      - name: Run linter
-        run: |
-          cd deltachat-jsonrpc/typescript
-          npm run prettier:check

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

@@ -1,32 +0,0 @@
-# documentation: https://github.com/deltachat/sysadmin/tree/master/download.delta.chat
-name: Delete node PR previews
-
-on:
-  pull_request:
-    types: [closed]
-
-jobs:
-  delete:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Get Pullrequest ID
-      id: getid
-      run: |
-        export PULLREQUEST_ID=$(jq .number < $GITHUB_EVENT_PATH)
-        echo "prid=$PULLREQUEST_ID" >> $GITHUB_OUTPUT
-    - name: Renaming
-      run: |
-        # create empty file to copy it over the outdated deliverable on download.delta.chat
-        echo "This preview build is outdated and has been removed." > empty
-        cp empty deltachat-node-${{ steps.getid.outputs.prid }}.tar.gz
-    - name: Replace builds with dummy files
-      uses: horochx/deploy-via-scp@v1.0.1
-      with:
-        user: ${{ secrets.USERNAME }}
-        key: ${{ secrets.SSH_KEY }}
-        host: "download.delta.chat"
-        port: 22
-        local: "deltachat-node-${{ steps.getid.outputs.prid }}.tar.gz"
-        remote: "/var/www/html/download/node/preview/"

.github/workflows/node-docs.yml

@@ -1,34 +0,0 @@
-name: Generate & upload node.js documentation
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  generate:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Use Node.js 16.x
-      uses: actions/setup-node@v3
-      with:
-        node-version: 16.x
-
-    - name: npm install and generate documentation
-      run: |
-        cd node
-        npm i --ignore-scripts
-        npx typedoc
-        mv docs js
-
-    - name: Upload
-      uses: horochx/deploy-via-scp@v1.0.1
-      with:
-        user: ${{ secrets.USERNAME }}
-        key: ${{ secrets.KEY }}
-        host: "delta.chat"
-        port: 22
-        local: "node/js"
-        remote: "/var/www/html/"

.github/workflows/node-package.yml

@@ -1,165 +0,0 @@
-name: 'node.js build'
-on:
-  pull_request:
-  push:
-    tags:
-    - '*'
-    - '!py-*'
-
-
-jobs:
-  prebuild:
-    name: 'prebuild'
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-18.04, macos-latest, windows-latest]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-      - name: System info
-        run: |
-          rustc -vV
-          rustup -vV
-          cargo -vV
-          npm --version
-          node --version
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: |
-            ${{ env.APPDATA }}/npm-cache
-            ~/.npm
-          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
-
-      - name: Cache cargo index
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/registry/
-            ~/.cargo/git
-            target
-          key: ${{ matrix.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}-2
-
-      - name: Install dependencies & build
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          cd node
-          npm install --verbose
-
-      - name: Build Prebuild
-        run: |
-          cd node
-          npm run prebuildify
-          tar -zcvf "${{ matrix.os }}.tar.gz" -C prebuilds .
-
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ matrix.os }}
-          path: node/${{ matrix.os }}.tar.gz
-
-  pack-module:
-    needs: prebuild
-    name: 'Package deltachat-node and upload to download.delta.chat'
-    runs-on: ubuntu-18.04
-    steps:
-      - name: install tree
-        run: sudo apt install tree
-      - name: Checkout
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '16'
-      - name: get tag
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-        continue-on-error: true
-      - name: Get Pullrequest ID
-        id: prepare
-        run: |
-          tag=${{ steps.tag.outputs.tag }}
-          if [ -z "$tag" ]; then
-            node -e "console.log('DELTACHAT_NODE_TAR_GZ=deltachat-node-' + '${{ github.ref }}'.split('/')[2] + '.tar.gz')" >> $GITHUB_ENV
-          else
-            echo "DELTACHAT_NODE_TAR_GZ=deltachat-node-${{ steps.tag.outputs.tag }}.tar.gz" >> $GITHUB_ENV
-            echo "No preview will be uploaded this time, but the $tag release"
-          fi
-      - name: System info
-        run: |
-          rustc -vV
-          rustup -vV
-          cargo -vV
-          npm --version
-          node --version
-          echo $DELTACHAT_NODE_TAR_GZ
-      - name: Download ubuntu prebuild
-        uses: actions/download-artifact@v1
-        with:
-          name: ubuntu-18.04
-      - name: Download macos prebuild
-        uses: actions/download-artifact@v1
-        with:
-          name: macos-latest
-      - name: Download windows prebuild
-        uses: actions/download-artifact@v1
-        with:
-          name: windows-latest
-      - shell: bash
-        run: |
-          mkdir node/prebuilds
-          tar -xvzf ubuntu-18.04/ubuntu-18.04.tar.gz -C node/prebuilds
-          tar -xvzf macos-latest/macos-latest.tar.gz -C node/prebuilds
-          tar -xvzf windows-latest/windows-latest.tar.gz -C node/prebuilds
-          tree node/prebuilds
-          rm -rf ubuntu-18.04 macos-latest windows-latest
-      - name: install dependencies without running scripts
-        run: |
-          npm install --ignore-scripts
-      - name: build constants
-        run: |
-          npm run build:core:constants
-      - name: build typescript part
-        run: |
-          npm run build:bindings:ts
-      - name: package
-        shell: bash
-        run: |
-          mv node/README.md README.md
-          npm pack .
-          ls -lah
-          mv $(find deltachat-node-*) $DELTACHAT_NODE_TAR_GZ
-      - name: Upload Prebuild
-        uses: actions/upload-artifact@v3
-        with:
-          name: deltachat-node.tgz
-          path: ${{ env.DELTACHAT_NODE_TAR_GZ }}
-      # Upload to download.delta.chat/node/preview/
-      - name: Upload deltachat-node preview to download.delta.chat/node/preview/
-        if: ${{ ! steps.tag.outputs.tag }}
-        id: upload-preview
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r $DELTACHAT_NODE_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/preview/"
-        continue-on-error: true
-      - name: "Post links to details"
-        if: steps.upload-preview.outcome == 'success'
-        run: node ./node/scripts/postLinksToDetails.js
-        env:
-         URL: preview/${{ env.DELTACHAT_NODE_TAR_GZ }}
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      # Upload to download.delta.chat/node/
-      - name: Upload deltachat-node build to download.delta.chat/node/
-        if: ${{ steps.tag.outputs.tag }}
-        id: upload
-        shell: bash
-        run: |
-          echo -e "${{ secrets.SSH_KEY }}" >__TEMP_INPUT_KEY_FILE
-          chmod 600 __TEMP_INPUT_KEY_FILE
-          scp -o StrictHostKeyChecking=no -v -i __TEMP_INPUT_KEY_FILE -P "22" -r $DELTACHAT_NODE_TAR_GZ "${{ secrets.USERNAME }}"@"download.delta.chat":"/var/www/html/download/node/"

.github/workflows/node-tests.yml

@@ -1,69 +0,0 @@
-name: 'node.js tests'
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - staging
-      - trying
-
-jobs:
-  tests:
-    name: 'tests'
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-18.04, macos-latest, windows-latest]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-      - name: System info
-        run: |
-          rustc -vV
-          rustup -vV
-          cargo -vV
-          npm --version
-          node --version
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: |
-            ${{ env.APPDATA }}/npm-cache
-            ~/.npm
-          key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
-
-      - name: Cache cargo index
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/registry/
-            ~/.cargo/git
-            target
-          key: ${{ matrix.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}-2
-
-      - name: Install dependencies & build
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: |
-          cd node
-          npm install --verbose
-
-      - name: Test
-        timeout-minutes: 10
-        if: runner.os != 'Windows'
-        run: |
-          cd node
-          npm run test
-        env:
-          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-      - name: Run tests on Windows, except lint
-        timeout-minutes: 10
-        if: runner.os == 'Windows'
-        run: |
-          cd node
-          npm run test:mocha
-        env:
-          DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}

.github/workflows/repl.yml

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

.github/workflows/upload-docs.yml

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

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

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

.gitignore

@@ -12,8 +12,8 @@ include
 *.db
 *.db-blobs
 
-.tox
 python/.eggs
+python/.tox
 *.egg-info
 __pycache__
 python/src/deltachat/capi*.so
@@ -33,10 +33,3 @@ coverage/
 python/accounts.txt
 python/all-testaccounts.txt
 tmp/
-
-# from deltachat-node
-node_modules/
-node/build/
-node/dist/
-node/prebuilds/
-node/.nyc_output/

.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

CHANGELOG.md

@@ -1,542 +1,5 @@
 # Changelog
 
-## Unreleased
-
-### Changes
-
-### API-Changes
-
-### Fixes
-
-
-## 1.104.0
-
-### Changes
-- Don't use deprecated `chrono` functions #3798
-- Document accounts manager #3837
-- If a classical-email-user sends an email to a group and adds new recipients,
-  add the new recipients as group members #3781
-- Remove `pytest-async` plugin #3846
-- Only send the message about ephemeral timer change if the chat is promoted #3847
-- Use relative paths in `accounts.toml` #3838
-
-### API-Changes
-
-### Fixes
-- Set read/write timeouts for IMAP over SOCKS5 #3833
-- Treat attached PGP keys as peer keys with mutual encryption preference #3832
-- fix migration of old databases #3842
-- Fix cargo clippy and doc errors after Rust update to 1.66 #3850
-- Don't send GroupNameChanged message if the group name doesn't change in terms of
-  `improve_single_line_input()` #3852
-- Prefer encryption for the peer if the message is encrypted or signed with the known key #3849
-
-
-## 1.103.0
-
-### Changes
-- Disable Autocrypt & Authres-checking for mailing lists,
-  because they don't work well with mailing lists #3765
-- Refactor: Remove the remaining AsRef<str> #3669
-- Add more logging to `fetch_many_msgs` and refactor it #3811
-- Small speedup #3780
-- Log the reason when the message cannot be sent to the chat #3810
-- Add IMAP server ID line to the context info only when it is known #3814
-- Remove autogenerated typescript files #3815
-- Move functions that require an IMAP session from `Imap` to `Session`
-  to reduce the number of code paths where IMAP session may not exist.
-  Drop connection on error instead of trying to disconnect,
-  potentially preventing IMAP task from getting stuck. #3812
-
-### API-Changes
-- Add Python API to send reactions #3762
-- jsonrpc: add message errors to MessageObject #3788
-- jsonrpc: Add async Python client #3734
-
-### Fixes
-- Make sure malformed messsages will never block receiving further messages anymore #3771
-- strip leading/trailing whitespace from "Chat-Group-Name{,-Changed}:" headers content #3650
-- Assume all Thunderbird users prefer encryption #3774
-- refactor peerstate handling to ensure no duplicate peerstates #3776
-- Fetch messages in order of their INTERNALDATE (fixes reactions for Gmail f.e.) #3789
-- python: do not pass NULL to ffi.gc if the context can't be created #3818
-- Add read/write timeouts to IMAP sockets #3820
-- Add connection timeout to IMAP sockets #3828
-- Disable read timeout during IMAP IDLE #3826
-- Bots automatically accept mailing lists #3831
-
-
-## 1.102.0
-
-### Changes
-
-- If an email has multiple From addresses, handle this as if there was
-  no From address, to prevent from forgery attacks. Also, improve
-  handling of emails with invalid From addresses in general #3667
-
-### API-Changes
-
-### Fixes
-- fix detection of "All mail", "Trash", "Junk" etc folders. #3760
-- fetch messages sequentially to fix reactions on partially downloaded messages #3688
-- Fix a bug where one malformed message blocked receiving any further messages #3769
-
-
-## 1.101.0
-
-### Changes
-- add `configured_inbox_folder` to account info #3748
-- `dc_delete_contact()` hides contacts if referenced #3751
-- add IMAP UIDs to message info #3755
-
-### Fixes
-- improve IMAP logging, in particular fix incorrect "IMAP IDLE protocol
-  timed out" message on network error during IDLE #3749
-- pop Recently Seen Loop event out of the queue when it is in the past
-  to avoid busy looping #3753
-- fix build failures by going back to standard `async_zip` #3747
-
-
-## 1.100.0
-
-### API-Changes
-- jsonrpc: add `miscSaveSticker` method
-
-### Changes
-- add JSON-RPC stdio server `deltachat-rpc-server` and use it for JSON-RPC tests #3695
-- update rPGP from 0.8 to 0.9 #3737
-- jsonrpc: typescript client: use npm released deltachat fork of the tiny emitter package #3741
-- jsonrpc: show sticker image in quote #3744
-
-
-
-## 1.99.0
-
-### API-Changes
-- breaking jsonrpc: changed function naming
-  - `autocryptInitiateKeyTransfer` -> `initiateAutocryptKeyTransfer`
-  - `autocryptContinueKeyTransfer` -> `continueAutocryptKeyTransfer`
-  - `chatlistGetFullChatById` -> `getFullChatById`
-  - `messageGetMessage` -> `getMessage`
-  - `messageGetMessages` -> `getMessages`
-  - `messageGetNotificationInfo` -> `getMessageNotificationInfo`
-  - `contactsGetContact` -> `getContact`
-  - `contactsCreateContact` -> `createContact`
-  - `contactsCreateChatByContactId` -> `createChatByContactId`
-  - `contactsBlock` -> `blockContact`
-  - `contactsUnblock` -> `unblockContact`
-  - `contactsGetBlocked` -> `getBlockedContacts`
-  - `contactsGetContactIds` -> `getContactIds`
-  - `contactsGetContacts` -> `getContacts`
-  - `contactsGetContactsByIds` -> `getContactsByIds`
-  - `chatGetMedia` -> `getChatMedia`
-  - `chatGetNeighboringMedia` -> `getNeighboringChatMedia`
-  - `webxdcSendStatusUpdate` -> `sendWebxdcStatusUpdate`
-  - `webxdcGetStatusUpdates` -> `getWebxdcStatusUpdates`
-  - `messageGetWebxdcInfo` -> `getWebxdcInfo`
-- jsonrpc: changed method signature
-  - `miscSendTextMessage(accountId, text, chatId)` -> `miscSendTextMessage(accountId, chatId, text)`
-- jsonrpc: add `SystemMessageType` to `Message`
-- cffi: add missing `DC_INFO_` constants
-- Add DC_EVENT_INCOMING_MSG_BUNCH event #3643
-- Python bindings: Make get_matching() only match the
-  whole event name, e.g. events.get_matching("DC_EVENT_INCOMING_MSG")
-  won't match DC_EVENT_INCOMING_MSG_BUNCH anymore #3643
-
-
-- Rust: Introduce a ContextBuilder #3698
-
-### Changes
-- allow sender timestamp to be in the future, but not too much
-- Disable the new "Authentication-Results/DKIM checking" security feature
-  until we have tested it a bit #3728
-- refactorings #3706
-
-### Fixes
-- `dc_search_msgs()` returns unaccepted requests #3694
-- emit "contacts changed" event when the contact is no longer "seen recently" #3703
-- do not allow peerstate reset if DKIM check failed #3731
-
-
-## 1.98.0
-
-### API-Changes
-- jsonrpc: typescript client: export constants under `C` enum, similar to how its exported from `deltachat-node` #3681
-- added reactions support #3644
-- jsonrpc: reactions: added reactions to `Message` type and the `sendReaction()` method #3686
-
-### Changes
-- simplify `UPSERT` queries #3676
-
-### Fixes
-
-
-## 1.97.0
-
-### API-Changes
-- jsonrpc: add function: #3641, #3645, #3653
-  - `getChatContacts()`
-  - `createGroupChat()`
-  - `createBroadcastList()`
-  - `setChatName()`
-  - `setChatProfileImage()`
-  - `downloadFullMessage()`
-  - `lookupContactIdByAddr()`
-  - `sendVideochatInvitation()`
-  - `searchMessages()`
-  - `messageIdsToSearchResults()`
-  - `setChatVisibility()`
-  - `getChatEphemeralTimer()`
-  - `setChatEphemeralTimer()`
-  - `getLocations()`
-  - `getAccountFileSize()`
-  - `estimateAutoDeletionCount()`
-  - `setStockStrings()`
-  - `exportSelfKeys()`
-  - `importSelfKeys()`
-  - `sendSticker()`
-  - `changeContactName()`
-  - `deleteContact()`
-  - `joinSecurejoin()`
-  - `stopIoForAllAccounts()`
-  - `startIoForAllAccounts()`
-  - `startIo()`
-  - `stopIo()`
-  - `exportBackup()`
-  - `importBackup()`
-  - `getMessageHtml()` #3671
-  - `miscGetStickerFolder` and `miscGetStickers` #3672
-- breaking: jsonrpc: remove function `messageListGetMessageIds()`, it is replaced by `getMessageIds()` and `getMessageListItems()` the latter returns a new `MessageListItem` type, which is the now prefered way of using the message list.
-- jsonrpc: add type: #3641, #3645
-  - `MessageSearchResult`
-  - `Location`
-- jsonrpc: add `viewType` to quoted message(`MessageQuote` type) in `Message` object type #3651
-
-
-### Changes
-- Look at Authentication-Results. Don't accept Autocrypt key changes
-  if they come with negative authentiation results while this contact
-  sent emails with positive authentication results in the past. #3583
-- jsonrpc in cffi also sends events now #3662
-- jsonrpc: new format for events and better typescript autocompletion
-- Join all "[migration] vXX" log messages into one
-
-### Fixes
-- share stock string translations across accounts created by the same account manager #3640
-- suppress welcome device messages after account import #3642
-- fix unix timestamp used for daymarker #3660
-
-## 1.96.0
-
-### Changes
-- jsonrpc js client:
-  - Change package name from `deltachat-jsonrpc-client` to `@deltachat/jsonrpc-client`
-  - remove relative file dependency to it from `deltachat-node` (because it did not work anyway and broke the nix build of desktop)
-  - ci: add github ci action to upload it to our download server automaticaly on realease
-
-## 1.95.0
-
-### API-Changes
-- jsonrpc: add `mailingListAddress` property to `FullChat` #3607
-- jsonrpc: add `MessageNotificationInfo` & `messageGetNotificationInfo()` #3614
-- jsonrpc: add `chat_get_neighboring_media` function #3610
-
-### Changes
-- added `dclogin:` scheme to allow configuration from a qr code
-  (data inside qrcode, contrary to `dcaccount:` which points to an API to create an account) #3541
-- truncate incoming messages by lines instead of just length #3480
-- emit separate `DC_EVENT_MSGS_CHANGED` for each expired message,
-  and `DC_EVENT_WEBXDC_INSTANCE_DELETED` when a message contains a webxdc #3605
-- enable `bcc_self` by default #3612
-
-
-## 1.94.0
-
-### API-Changes
-- breaking change: replace `dc_accounts_event_emitter_t` with `dc_event_emitter_t` #3422
-
-  Type `dc_accounts_event_emitter_t` is removed.
-  `dc_accounts_get_event_emitter()` returns `dc_event_emitter_t` now, so
-  `dc_get_next_event()` should be used instead of `dc_accounts_get_next_event`
-  and `dc_event_emitter_unref()` should be used instead of
-  `dc_accounts_event_emitter_unref`.
-- add `dc_contact_was_seen_recently()` #3560
-- Fix `get_connectivity_html` and `get_encrinfo` futures not being Send. See rust-lang/rust#101650 for more information
-- jsonrpc: add functions: #3586, #3587, #3590
-  - `deleteChat()`
-  - `getChatEncryptionInfo()`
-  - `getChatSecurejoinQrCodeSvg()`
-  - `leaveGroup()`
-  - `removeContactFromChat()`
-  - `addContactToChat()`
-  - `deleteMessages()`
-  - `getMessageInfo()`
-  - `getBasicChatInfo()`
-  - `marknoticedChat()`
-  - `getFirstUnreadMessageOfChat()`
-  - `markseenMsgs()`
-  - `forwardMessages()`
-  - `removeDraft()`
-  - `getDraft()`
-  - `miscSendMsg()`
-  - `miscSetDraft()`
-  - `maybeNetwork()`
-  - `getConnectivity()`
-  - `getContactEncryptionInfo()`
-  - `getConnectivityHtml()`
-- jsonrpc: add `is_broadcast` property to `ChatListItemFetchResult` #3584
-- jsonrpc: add `was_seen_recently` property to `ChatListItemFetchResult`, `FullChat` and `Contact` #3584
-- jsonrpc: add `webxdc_info` property to `Message` #3588
-- python: move `get_dc_event_name()` from `deltachat` to `deltachat.events` #3564
-- jsonrpc: add `webxdc_info`, `parent_id` and `download_state` property to `Message` #3588, #3590
-- jsonrpc: add `BasicChat` object as a leaner alternative to `FullChat` #3590
-- jsonrpc: add `last_seen` property to `Contact` #3590
-- breaking! jsonrpc: replace `Message.quoted_text` and `Message.quoted_message_id` with `Message.quote` #3590
-- add separate stock strings for actions done by contacts to make them easier to translate #3518
-- `dc_initiate_key_transfer()` is non-blocking now. #3553
-  UIs don't need to display a button to cancel sending Autocrypt Setup Message with
-  `dc_stop_ongoing_process()` anymore.
-
-### Changes
-- order contact lists by "last seen";
-  this affects `dc_get_chat_contacts()`, `dc_get_contacts()` and `dc_get_blocked_contacts()` #3562
-- add `internet_access` flag to `dc_msg_get_webxdc_info()` #3516
-- `DC_EVENT_WEBXDC_INSTANCE_DELETED` is emitted when a message containing a webxdc gets deleted #3592
-
-### Fixes
-- do not emit notifications for blocked chats #3557
-- Show attached .eml files correctly #3561
-- Auto accept contact requests if `Config::Bot` is set for a client #3567 
-- Don't prepend the subject to chat messages in mailinglists
-- fix `set_core_version.py` script to also update version in `deltachat-jsonrpc/typescript/package.json` #3585
-- Reject webxcd-updates from contacts who are not group members #3568
-
-
-## 1.93.0
-
-### API-Changes
-- added a JSON RPC API, accessible through a WebSocket server, the CFFI bindings and the Node.js bindings #3463 #3554 #3542
-- JSON RPC methods in CFFI #3463:
- - `dc_jsonrpc_instance_t* dc_jsonrpc_init(dc_accounts_t* account_manager);`
- - `void dc_jsonrpc_unref(dc_jsonrpc_instance_t* jsonrpc_instance);`
- - `void dc_jsonrpc_request(dc_jsonrpc_instance_t* jsonrpc_instance, char* request);`
- - `char* dc_jsonrpc_next_response(dc_jsonrpc_instance_t* jsonrpc_instance);`
-- node: JSON RPC methods #3463:
- - `AccountManager.prototype.startJsonRpcHandler(callback: ((response: string) => void)): void`
- - `AccountManager.prototype.jsonRpcRequest(message: string): void`
-
-### Changes
-- use [pathlib](https://docs.python.org/3/library/pathlib.html) in provider update script #3543
-- `dc_get_chat_media()` can return media globally #3528
-- node: add `getMailinglistAddr()` #3524
-- avoid duplicate encoded-words package and test `cargo vendor` in ci #3549
-- python: don't raise an error if addr changes #3530
-- improve coverage script #3530
-
-### Fixes
-- improved error handling for account setup from qrcode #3474
-- python: enable certificate checks in cloned accounts #3443
-
-
-## 1.92.0
-
-### API-Changes
-- add `dc_chat_get_mailinglist_addr()` #3520
-
-
-## 1.91.0
-
-### Added
-- python bindings: extra method to get an account running
-
-### Changes
-- refactorings #3437
-
-### Fixes
-- mark "group image changed" as system message on receiver side #3517
-
-
-## 1.90.0
-
-### Changes
-- handle drafts from mailto links in scanned QR #3492
-- do not overflow ratelimiter leaky bucket #3496
-- (AEAP) Add device message after you changed your address #3505
-- (AEAP) Revert #3491, instead only replace contacts in verified groups #3510
-- improve python bindings and tests #3502 #3503
-
-### Fixes
-- don't squash text parts of NDN into attachments #3497
-- do not treat non-failed DSNs as NDNs #3506
-
-
-## 1.89.0
-
-### Changes
-
-- (AEAP) When one of your contacts changed their address, they are
-  only replaced in the chat where you got a message from them
-  for now #3491
-
-### Fixes
-- replace musl libc name resolution errors with a better message #3485
-- handle updates for not yet downloaded webxdc instances #3487
-
-
-## 1.88.0
-
-### Changes
-- Implemented "Automatic e-mail address Porting" (AEAP). You can
-  configure a new address in DC now, and when receivers get messages
-  they will automatically recognize your moving to a new address. #3385
-- switch from `async-std` to `tokio` as the async runtime #3449
-- upgrade to `pgp@0.8.0` #3467
-- add IMAP ID extension support #3468
-- configure DeltaChat folder by selecting it, so it is configured even if not LISTed #3371
-- build PyPy wheels #6683
-- improve default error if NDN does not provide an error #3456
-- increase ratelimit from 3 to 6 messages per 60 seconds #3481
-
-### Fixes
-- mailing list: remove square-brackets only for first name #3452
-- do not use footers from mailinglists as the contact status #3460
-- don't ignore KML parsing errors #3473
-
-
-## 1.87.0
-
-### Changes
-- limit the rate of MDN sending #3402
-- ignore ratelimits for bots #3439
-- remove `msgs_mdns` references to deleted messages during housekeeping #3387
-- format message lines starting with `>` as quotes #3434
-- node: remove `split2` dependency #3418
-- node: add git installation info to readme #3418
-- limit the rate of webxdc update sending #3417
-
-### Fixes
-- set a default error if NDN does not provide an error #3410
-- python: avoid exceptions when messages/contacts/chats are compared with `None`
-- node: wait for the event loop to stop before destroying contexts #3431 #3451
-- emit configuration errors via event on failure #3433
-- report configure and imex success/failure after freeing ongoing process #3442
-
-### API-Changes
-- python: added `Message.get_status_updates()`  #3416
-- python: added `Message.send_status_update()`  #3416
-- python: added `Message.is_webxdc()`  #3416
-- python: added `Message.is_videochat_invitation()`  #3416
-- python: added support for "videochat" and "webxdc" view types to `Message.new_empty()`  #3416
-
-
-## 1.86.0
-
-### API-Changes
-- python: added optional `closed` parameter to `Account` constructor #3394
-- python: added optional `passphrase` parameter to `Account.export_all()` and `Account.import_all()` #3394
-- python: added `Account.open()` #3394
-- python: added `Chat.is_single()` #3394
-- python: added `Chat.is_mailinglist()` #3394
-- python: added `Chat.is_broadcast()` #3394
-- python: added `Chat.is_multiuser()` #3394
-- python: added `Chat.is_self_talk()` #3394
-- python: added `Chat.is_device_talk()` #3394
-- python: added `Chat.is_pinned()` #3394
-- python: added `Chat.pin()` #3394
-- python: added `Chat.unpin()` #3394
-- python: added `Chat.archive()` #3394
-- python: added `Chat.unarchive()` #3394
-- python: added `Message.get_summarytext()` #3394
-- python: added optional `closed` parameter to `ACFactory.get_unconfigured_account()` (pytest plugin) #3394
-- python: added optional `passphrase` parameter to `ACFactory.get_pseudo_configured_account()` (pytest plugin) #3394
-
-### Changes
-- clean up series of webxdc info messages;
-  `DC_EVENT_MSGS_CHANGED` is emitted on changes of existing info messages #3395
-- update provider database #3399
-- refactorings #3375 #3403 #3398 #3404
-
-### Fixes
-- do not reset our database if imported backup cannot be decrypted #3397
-- node: remove `npx` from build script, this broke flathub build #3396
-
-
-## 1.85.0
-
-### Changes
-- refactorings #3373 #3345 #3380 #3382
-- node: move split2 to devDependencies
-- python: build Python 3.10 wheels #3392
-- update Rust dependencies
-
-### Fixes
-- delete outgoing MDNs found in the Sent folder on Gmail #3372
-- fix searching one-to-one chats #3377
-- do not add legacy info-messages on resending webxdc #3389
-
-
-## 1.84.0
-
-### Changes
-- refactorings #3354 #3347 #3353 #3346
-
-### Fixes
-- do not unnecessarily SELECT folders if there are no operations planned on
-  them #3333
-- trim chat encryption info #3350
-- fix failure to decrypt first message to self after key synchronization
-  via Autocrypt Setup Message #3352
-- Keep pgp key when you change your own email address #3351
-- Do not ignore Sent and Spam folders on Gmail #3369
-- handle decryption errors explicitly and don't get confused by encrypted mail attachments #3374
-
-
-## 1.83.0
-
-### Fixes
-- fix node prebuild & package ci #3337
-
-
-## 1.82.0
-
-### API-Changes
-- re-add removed `DC_MSG_ID_MARKER1` as in use on iOS #3330
-
-### Changes
-- refactorings #3328
-
-### Fixes
-- fix node package ci #3331
-- fix race condition in ongoing process (import/export, configuration) allocation #3322
-
-
-## 1.81.0
-
-### API-Changes
-- deprecate unused `marker1before` argument of `dc_get_chat_msgs`
-  and remove `DC_MSG_ID_MARKER1` constant #3274
-
-### Changes
-- now the node-bindings are also part of this repository 🎉 #3283
-- support `source_code_url` from Webxdc manifests #3314
-- support Webxdc document names and add `document` to `dc_msg_get_webxdc_info()` #3317 #3324
-- improve chat encryption info, make it easier to find contacts without keys #3318
-- improve error reporting when creating a folder fails #3325
-- node: remove unmaintained coverage scripts
-- send normal messages with higher priority than MDNs #3243
-- make Scheduler stateless #3302
-- abort instead of unwinding on panic #3259
-- improve python bindings #3297 #3298
-- improve documentation #3307 #3306 #3309 #3319 #3321
-- refactorings #3304 #3303 #3323
-
-### Fixes
-- node: throw error when getting context with an invalid account id
-- node: throw error when instanciating a wrapper class on `null` (Context, Message, Chat, ChatList and so on)
-- use same contact-color if email address differ only in upper-/lowercase #3327
-- repair encrypted mails "mixed up" by Google Workspace "Append footer" function #3315
-
-
 ## 1.80.0
 
 ### Changes

CMakeLists.txt

@@ -21,7 +21,7 @@ add_custom_command(
         PREFIX=${CMAKE_INSTALL_PREFIX}
         LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}
         INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR}
-        ${CARGO} build --release --no-default-features --features jsonrpc
+        ${CARGO} build --release --no-default-features
 
 	# Build in `deltachat-ffi` directory instead of using
 	# `--package deltachat_ffi` to avoid feature resolver version

Cargo.toml

@@ -1,67 +1,62 @@
 [package]
 name = "deltachat"
-version = "1.104.0"
+version = "1.80.0"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.61"
+rust-version = "1.56"
 
 [profile.dev]
 debug = 0
-panic = 'abort'
-opt-level = 1
-
-[profile.test]
-opt-level = 0
 
 [profile.release]
 lto = true
-panic = 'abort'
 
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
 
 ansi_term = { version = "0.12.1", optional = true }
 anyhow = "1"
-async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", default-features = false, features = ["runtime-tokio"] }
-async-native-tls = { version = "0.4", default-features = false, features = ["runtime-tokio"] }
-async-smtp = { version = "0.5", default-features = false, features = ["smtp-transport", "socks5", "runtime-tokio"] }
-trust-dns-resolver = "0.22"
-tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
-tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
+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", default-features=false, features = ["smtp-transport", "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 = { version = "0.4", default-features=false, features = ["clock", "std"] }
+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" }
+encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
 escaper = "0.1"
 futures = "0.3"
 hex = "0.4.0"
-image = { version = "0.24.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+image = { version = "0.24.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.14"
+num_cpus = "1.13"
 num-derive = "0.3"
 num-traits = "0.2"
-once_cell = "1.16.0"
-percent-encoding = "2.2"
-pgp = { version = "0.9", default-features = false }
+once_cell = "1.10.0"
+percent-encoding = "2.0"
+pgp = { version = "0.7", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
-quick-xml = "0.23"
+quick-xml = "0.22"
 r2d2 = "0.8"
 r2d2_sqlite = "0.20"
-rand = "0.8"
-regex = "1.7"
+rand = "0.7"
+regex = "1.5"
 rusqlite = { version = "0.27", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
-rustyline = { version = "10", optional = true }
-sanitize-filename = "0.4"
+rustyline = { version = "9", optional = true }
+sanitize-filename = "0.3"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 sha-1 = "0.10"
@@ -69,38 +64,32 @@ sha2 = "0.10"
 smallvec = "1"
 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"] }
-fast-socks5 = "0.8"
-humansize = "2"
+uuid = { version = "0.8", features = ["serde", "v4"] }
+fast-socks5 = "0.4"
+humansize = "1"
 qrcodegen = "1.7.0"
-tagger = "4.3.4"
-textwrap = "0.16.0"
-async-channel = "1.8.0"
-futures-lite = "1.12.0"
-tokio-stream = { version = "0.1.11", features = ["fs"] }
-tokio-io-timeout = "1.2.0"
-reqwest = { version = "0.11.13", features = ["json"] }
-async_zip = { version = "0.0.9", default-features = false, features = ["deflate"] }
+tagger = "4.3.3"
+textwrap = "0.15.0"
+zip = { version = "0.6.2", default-features = false, features = ["deflate"] }
 
 [dev-dependencies]
 ansi_term = "0.12.0"
-criterion = { version = "0.4.0", features = ["async_tokio"] }
+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 = "3"
-tokio = { version = "1", features = ["parking_lot", "rt-multi-thread", "macros"] }
 
 [workspace]
 members = [
   "deltachat-ffi",
   "deltachat_derive",
-  "deltachat-jsonrpc",
-  "deltachat-rpc-server"
 ]
 
 [[example]]
@@ -142,10 +131,5 @@ harness = false
 default = ["vendored"]
 internals = []
 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",
-  "reqwest/native-tls-vendored"
-]
+vendored = ["async-native-tls/vendored", "async-smtp/native-tls-vendored", "rusqlite/bundled-sqlcipher-vendored-openssl"]
 nightly = ["pgp/nightly"]

README.md

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

benches/contacts.rs

@@ -1,17 +1,14 @@
+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 {}\naddr{}@example.org\n", i, i))
@@ -27,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,11 +1,12 @@
+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 std::path::PathBuf;
 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 mut accounts = Accounts::new(p.clone()).await.unwrap();
 
@@ -17,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 @@
-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, 0).await.ok());
+        black_box(chat::get_chat_msgs(&context, *c, 0, None).await.ok());
     }
 }
 
@@ -23,19 +20,15 @@ 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)
+            b.to_async(AsyncStdExecutor)
                 .iter(|| get_chat_msgs_benchmark(black_box(path.as_ref()), black_box(&chats)))
         });
     } else {

benches/get_chatlist.rs

@@ -1,11 +1,8 @@
-use std::path::Path;
-
+use criterion::async_executor::AsyncStdExecutor;
 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();
@@ -15,14 +12,10 @@ 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()
-        });
+        let context =
+            async_std::task::block_on(async { Context::new(path.into(), 100).await.unwrap() });
         c.bench_function("chatlist:try_load (Get Chatlist)", |b| {
-            b.to_async(&rt)
+            b.to_async(AsyncStdExecutor)
                 .iter(|| get_chat_list_benchmark(black_box(&context)))
         });
     } else {

benches/receive_emails.rs

@@ -1,13 +1,13 @@
-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;
 
@@ -31,60 +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) -> Context {
-    for i in 0..50 {
-        let imf_raw = format!(
-            "Subject: Benchmark
-Message-ID: Gr.OssSYnOFkhR.{i}@testrun.org
-Date: Sat, 07 Dec 2019 19:00:27 +0000
-To: alice@example.com, b@example.com, c@example.com, d@example.com, e@example.com, f@example.com
-From: sender@testrun.org
-Chat-Version: 1.0
-Chat-Disposition-Notification-To: sender@testrun.org
-Chat-User-Avatar: 0
-Chat-Group-Member-Added: charlie@example.com
-In-Reply-To: Gr.OssSYnOFkhR.{i_dec}@testrun.org
-MIME-Version: 1.0
-
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-
-Hello {i}",
-            i = i,
-            i_dec = i - 1,
-        );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
-            .await
-            .unwrap();
-
-        let imf_raw = format!(
-            "Subject: Benchmark
-Message-ID: Gr.OssSYnOFkhR.{i}@testrun.org
-Date: Sat, 07 Dec 2019 19:00:27 +0000
-To: alice@example.com, b@example.com, c@example.com, d@example.com, e@example.com, f@example.com
-From: sender@testrun.org
-Chat-Version: 1.0
-Chat-Disposition-Notification-To: sender@testrun.org
-Chat-User-Avatar: 0
-Chat-Group-Member-Removed: charlie@example.com
-In-Reply-To: Gr.OssSYnOFkhR.{i_dec}@testrun.org
-MIME-Version: 1.0
-
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-
-Hello {i}",
-            i = i,
-            i_dec = i - 1,
-        );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
+        dc_receive_imf(&context, black_box(imf_raw.as_bytes()), false)
             .await
             .unwrap();
     }
@@ -95,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();
     }
@@ -126,30 +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());
-
-        b.to_async(&rt).iter(|| {
-            let ctx = context.clone();
-            async move {
-                recv_all_emails(black_box(ctx)).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());
-
-            b.to_async(&rt).iter(|| {
-                let ctx = context.clone();
-                async move {
-                    recv_groupmembership_emails(black_box(ctx)).await;
-                }
-            });
-        },
-    );
     group.finish();
 }
 

benches/search_msgs.rs

@@ -1,14 +1,12 @@
+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();
@@ -19,10 +17,8 @@ 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");

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.104.0"
+version = "1.80.0"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
@@ -16,20 +16,17 @@ crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
 deltachat = { path = "../", default-features = false }
-deltachat-jsonrpc = { path = "../deltachat-jsonrpc", optional = true }
 libc = "0.2"
 human-panic = "1"
 num-traits = "0.2"
 serde_json = "1.0"
-tokio = { version = "1", features = ["rt-multi-thread"] }
+async-std = "1"
 anyhow = "1"
 thiserror = "1"
 rand = "0.7"
-once_cell = "1.16.0"
 
 [features]
 default = ["vendored"]
 vendored = ["deltachat/vendored"]
 nightly = ["deltachat/nightly"]
-jsonrpc = ["deltachat-jsonrpc"]
 

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/deltachat.h

@@ -11,22 +11,19 @@ extern "C" {
 #endif
 
 
-typedef struct _dc_context   dc_context_t;
-typedef struct _dc_accounts  dc_accounts_t;
-typedef struct _dc_array     dc_array_t;
-typedef struct _dc_chatlist  dc_chatlist_t;
-typedef struct _dc_chat      dc_chat_t;
-typedef struct _dc_msg       dc_msg_t;
-typedef struct _dc_reactions dc_reactions_t;
-typedef struct _dc_contact   dc_contact_t;
-typedef struct _dc_lot       dc_lot_t;
-typedef struct _dc_provider  dc_provider_t;
-typedef struct _dc_event     dc_event_t;
+typedef struct _dc_context  dc_context_t;
+typedef struct _dc_accounts dc_accounts_t;
+typedef struct _dc_array    dc_array_t;
+typedef struct _dc_chatlist dc_chatlist_t;
+typedef struct _dc_chat     dc_chat_t;
+typedef struct _dc_msg      dc_msg_t;
+typedef struct _dc_contact  dc_contact_t;
+typedef struct _dc_lot      dc_lot_t;
+typedef struct _dc_provider dc_provider_t;
+typedef struct _dc_event    dc_event_t;
 typedef struct _dc_event_emitter dc_event_emitter_t;
-typedef struct _dc_jsonrpc_instance dc_jsonrpc_instance_t;
+typedef struct _dc_accounts_event_emitter dc_accounts_event_emitter_t;
 
-// Alias for backwards compatibility, use dc_event_emitter_t instead.
-typedef struct _dc_event_emitter dc_accounts_event_emitter_t;
 
 /**
  * @mainpage Getting started
@@ -394,8 +391,7 @@ char*           dc_get_blobdir               (const dc_context_t* context);
  *                    If no type is prefixed, the videochat is handled completely in a browser.
  * - `bot`          = Set to "1" if this is a bot.
  *                    Prevents adding the "Device messages" and "Saved messages" chats,
- *                    adds Auto-Submitted header to outgoing messages
- *                    and accepts contact requests automatically (calling dc_accept_chat() is not needed for bots).
+ *                    adds Auto-Submitted header to outgoing messages.
  * - `fetch_existing_msgs` = 1=fetch most recent existing messages on configure (default),
  *                    0=do not fetch existing messages on configure.
  *                    In both cases, existing recipients are added to the contact database.
@@ -469,10 +465,10 @@ int             dc_set_stock_translation(dc_context_t* context, uint32_t stock_i
 /**
  * Set configuration values from a QR code.
  * Before this function is called, dc_check_qr() should confirm the type of the
- * QR code is DC_QR_ACCOUNT, DC_QR_LOGIN or DC_QR_WEBRTC_INSTANCE.
+ * QR code is DC_QR_ACCOUNT or DC_QR_WEBRTC_INSTANCE.
  *
  * Internally, the function will call dc_set_config() with the appropriate keys,
- * e.g. `addr` and `mail_pw` for DC_QR_ACCOUNT and DC_QR_LOGIN
+ * e.g. `addr` and `mail_pw` for DC_QR_ACCOUNT
  * or `webrtc_instance` for DC_QR_WEBRTC_INSTANCE.
  *
  * @memberof dc_context_t
@@ -992,34 +988,6 @@ uint32_t        dc_send_text_msg             (dc_context_t* context, uint32_t ch
 uint32_t dc_send_videochat_invitation (dc_context_t* context, uint32_t chat_id);
 
 
-/**
- * Send a reaction to message.
- *
- * Reaction is a string of emojis separated by spaces. Reaction to a
- * single message can be sent multiple times. The last reaction
- * received overrides all previously received reactions. It is
- * possible to remove all reactions by sending an empty string.
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param msg_id ID of the message you react to.
- * @param reaction A string consisting of emojis separated by spaces.
- * @return The ID of the message sent out or 0 for errors.
- */
-uint32_t dc_send_reaction (dc_context_t* context, uint32_t msg_id, char *reaction);
-
-
-/**
- * Get a structure with reactions to the message.
- *
- * @memberof dc_context_t
- * @param context The context object.
- * @param msg_id The message ID to get reactions for.
- * @return A structure with all reactions to the message.
- */
-dc_reactions_t* dc_get_msg_reactions (dc_context_t *context, int msg_id);
-
-
 /**
  * A webxdc instance sends a status update to its other members.
  *
@@ -1206,7 +1174,8 @@ dc_msg_t*       dc_get_draft                 (dc_context_t* context, uint32_t ch
  *     be added before each day (regarding the local timezone). Set this to 0 if you do not want this behaviour.
  *     To get the concrete time of the marker, use dc_array_get_timestamp().
  *     If set to DC_GCM_INFO_ONLY, only system messages will be returned, can be combined with DC_GCM_ADDDAYMARKER.
- * @param marker1before Deprecated, set this to 0.
+ * @param marker1before An optional message ID. If set, the ID DC_MSG_ID_MARKER1 will be added just
+ *   before the given ID in the returned array. Set this to 0 if you do not want this behaviour.
  * @return Array of message IDs, must be dc_array_unref()'d when no longer used.
  */
 dc_array_t*     dc_get_chat_msgs             (dc_context_t* context, uint32_t chat_id, uint32_t flags, uint32_t marker1before);
@@ -1295,7 +1264,7 @@ void            dc_marknoticed_chat          (dc_context_t* context, uint32_t ch
 
 
 /**
- * Returns all message IDs of the given types in a given chat or any chat.
+ * Returns all message IDs of the given types in a chat.
  * Typically used to show a gallery.
  * The result must be dc_array_unref()'d
  *
@@ -1305,8 +1274,7 @@ void            dc_marknoticed_chat          (dc_context_t* context, uint32_t ch
  *
  * @memberof dc_context_t
  * @param context The context object as returned from dc_context_new().
- * @param chat_id >0: get messages with media from this chat ID.
- *    0: get messages with media from any chat of the currently used account.
+ * @param chat_id The chat ID to get all messages with media from.
  * @param msg_type Specify a message type to query here, one of the @ref DC_MSG constants.
  * @param msg_type2 Alternative message type to search for. 0 to skip.
  * @param msg_type3 Alternative message type to search for. 0 to skip.
@@ -1317,6 +1285,7 @@ dc_array_t*     dc_get_chat_media            (dc_context_t* context, uint32_t ch
 
 /**
  * Search next/previous message based on a given message and a list of types.
+ * The
  * Typically used to implement the "next" and "previous" buttons
  * in a gallery or in a media player.
  *
@@ -1417,9 +1386,6 @@ void            dc_block_chat                (dc_context_t* context, uint32_t ch
  *
  * Use it to accept "contact request" chats as indicated by dc_chat_is_contact_request().
  *
- * If the dc_set_config()-option `bot` is set,
- * all chats are accepted automatically and calling this function has no effect.
- *
  * @memberof dc_context_t
  * @param context The context object as returned from dc_context_new().
  * @param chat_id The ID of the chat to accept.
@@ -1826,11 +1792,6 @@ void            dc_delete_msgs               (dc_context_t* context, const uint3
 /**
  * Forward messages to another chat.
  *
- * All types of messages can be forwarded,
- * however, they will be flagged as such (dc_msg_is_forwarded() is set).
- *
- * Original sender, info-state and webxdc updates are not forwarded on purpose.
- *
  * @memberof dc_context_t
  * @param context The context object.
  * @param msg_ids An array of uint32_t containing all message IDs that should be forwarded.
@@ -2056,9 +2017,8 @@ char*           dc_get_contact_encrinfo      (dc_context_t* context, uint32_t co
 
 
 /**
- * Delete a contact so that it disappears from the corresponding lists.
- * Depending on whether there are ongoing chats, deletion is done by physical deletion or hiding.
- * The contact is deleted from the local device.
+ * Delete a contact. The contact is deleted from the local device. It may happen that this is not
+ * possible as the contact is in use. In this case, the contact can be blocked.
  *
  * May result in a #DC_EVENT_CONTACTS_CHANGED event.
  *
@@ -2204,10 +2164,11 @@ char*           dc_imex_has_backup           (dc_context_t* context, const char*
  * ~~~
  *
  * After that, this function should be called to send the Autocrypt Setup Message.
- * The function creates the setup message and adds it to outgoing message queue.
- * The message is sent asynchronously.
+ * The function creates the setup message and waits until it is really sent.
+ * As this may take a while, it is recommended to start the function in a separate thread;
+ * to interrupt it, you can use dc_stop_ongoing_process().
  *
- * The required setup code is returned in the following format:
+ * After everything succeeded, the required setup code is returned in the following format:
  *
  * ~~~
  * 1234-1234-1234-1234-1234-1234-1234-1234-1234
@@ -2273,8 +2234,8 @@ int             dc_continue_key_transfer     (dc_context_t* context, uint32_t ms
  * The ongoing process will return ASAP then, however, it may
  * still take a moment.
  *
- * Typical ongoing processes are started by dc_configure()
- * or dc_imex(). As there is always at most only
+ * Typical ongoing processes are started by dc_configure(),
+ * dc_initiate_key_transfer() or dc_imex(). As there is always at most only
  * one onging process at the same time, there is no need to define _which_ process to exit.
  *
  * @memberof dc_context_t
@@ -2300,7 +2261,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
 #define         DC_QR_WITHDRAW_VERIFYGROUP   502 // text1=groupname
 #define         DC_QR_REVIVE_VERIFYCONTACT   510
 #define         DC_QR_REVIVE_VERIFYGROUP     512 // text1=groupname
-#define         DC_QR_LOGIN                  520 // text1=email_address
 
 /**
  * Check a scanned QR code.
@@ -2328,7 +2288,7 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  * - DC_QR_FPR_MISMATCH with dc_lot_t::id=Contact ID:
  *   scanned fingerprint does not match last seen fingerprint.
  *
- * - DC_QR_FPR_WITHOUT_ADDR with dc_lot_t::text1=Formatted fingerprint
+ * - DC_QR_FPR_WITHOUT_ADDR with dc_lot_t::test1=Formatted fingerprint
  *   the scanned QR code contains a fingerprint but no e-mail address;
  *   suggest the user to establish an encrypted connection first.
  *
@@ -2341,8 +2301,7 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  *   if so, call dc_set_config_from_qr().
  *
  * - DC_QR_ADDR with dc_lot_t::id=Contact ID:
- *   e-mail address scanned, optionally, a draft message could be set in
- *   dc_lot_t::text1 in which case dc_lot_t::text1_meaning will be DC_TEXT1_DRAFT;
+ *   e-mail address scanned,
  *   ask the user if they want to start chatting;
  *   if so, call dc_create_chat_by_contact_id().
  *
@@ -2373,10 +2332,6 @@ void            dc_stop_ongoing_process      (dc_context_t* context);
  *   ask the user if they want to revive the withdrawn group-invite code;
  *   if so, call dc_set_config_from_qr().
  *
- * - DC_QR_LOGIN with dc_lot_t::text1=email_address:
- *   ask the user if they want to login with the email_address,
- *   if so, call dc_set_config_from_qr() and then dc_configure().
- *
  * @memberof dc_context_t
  * @param context The context object.
  * @param qr The text of the scanned QR code.
@@ -2550,9 +2505,9 @@ int         dc_set_location                 (dc_context_t* context, double latit
  *     Must be given in number of seconds since 00:00 hours, Jan 1, 1970 UTC.
  *     0 for "all up to now".
  * @return An array of locations, NULL is never returned.
- *     The array is sorted descending;
+ *     The array is sorted decending;
  *     the first entry in the array is the location with the newest timestamp.
- *     Note that this is only related to the recent position of the user
+ *     Note that this is only realated to the recent postion of the user
  *     if dc_array_is_independent() returns 0.
  *     The returned array must be freed using dc_array_unref().
  *
@@ -2876,7 +2831,7 @@ void           dc_accounts_maybe_network_lost    (dc_accounts_t* accounts);
  *
  * The library will emit various @ref DC_EVENT events as "new message", "message read" etc.
  * To get these events, you have to create an event emitter using this function
- * and call dc_get_next_event() on the emitter.
+ * and call dc_accounts_get_next_event() on the emitter.
  *
  * This is similar to dc_get_event_emitter(), which, however,
  * must not be called for accounts handled by the account manager.
@@ -2884,13 +2839,13 @@ void           dc_accounts_maybe_network_lost    (dc_accounts_t* accounts);
  * @memberof dc_accounts_t
  * @param accounts The account manager as created by dc_accounts_new().
  * @return Returns the event emitter, NULL on errors.
- *     Must be freed using dc_event_emitter_unref() after usage.
+ *     Must be freed using dc_accounts_event_emitter_unref() after usage.
  *
  * Note: Use only one event emitter per account manager.
  * Having more than one event emitter running at the same time on the same account manager
  * will result in events randomly delivered to the one or to the other.
  */
-dc_event_emitter_t* dc_accounts_get_event_emitter (dc_accounts_t* accounts);
+dc_accounts_event_emitter_t* dc_accounts_get_event_emitter (dc_accounts_t* accounts);
 
 
 /**
@@ -3297,19 +3252,6 @@ uint32_t        dc_chat_get_id               (const dc_chat_t* chat);
 int             dc_chat_get_type             (const dc_chat_t* chat);
 
 
-/**
- * Returns the address where messages are sent to if the chat is a mailing list.
- * If you just want to know if a mailing list can be written to,
- * use dc_chat_can_send() instead.
- *
- * @memberof dc_chat_t
- * @param chat The chat object.
- * @return The mailing list address. Must be released using dc_str_unref() after usage.
- *     If there is no such address, an empty string is returned, NULL is never returned.
- */
-char*           dc_chat_get_mailinglist_addr (const dc_chat_t* chat);
-
-
 /**
  * Get name of a chat. For one-to-one chats, this is the name of the contact.
  * For group chats, this is the name given e.g. to dc_create_group_chat() or
@@ -3505,7 +3447,7 @@ int64_t          dc_chat_get_remaining_mute_duration (const dc_chat_t* chat);
  */
 
 
-#define         DC_MSG_ID_MARKER1            1 // this is used by iOS to mark things in the message list
+#define         DC_MSG_ID_MARKER1            1
 #define         DC_MSG_ID_DAYMARKER          9
 #define         DC_MSG_ID_LAST_SPECIAL       9
 
@@ -3788,20 +3730,9 @@ char*             dc_msg_get_webxdc_blob      (const dc_msg_t* msg, const char*
  *   To get the file, use dc_msg_get_webxdc_blob().
  *   App icons should should be square,
  *   the implementations will add round corners etc. as needed.
- * - document: if the Webxdc represents a document, this is the name of the document,
- *   otherwise, this is an empty string.
  * - summary: short string describing the state of the app,
  *   sth. as "2 votes", "Highscore: 123",
  *   can be changed by the apps and defaults to an empty string.
- * - source_code_url:
- *   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.
- * - internet_access:
- *   true if the Webxdc should get full internet access, including Webrtc.
- *   currently, this is only true for encrypted Webxdc's in the self chat
- *   that have requested internet access in the manifest.
- *   this is useful for development and maybe for internal integrations at some point.
  *
  * @memberof dc_msg_t
  * @param msg The webxdc instance.
@@ -4043,7 +3974,7 @@ int             dc_msg_is_sent                (const dc_msg_t* msg);
  *
  * For privacy reasons, we do not provide the name or the e-mail address of the
  * original author (in a typical GUI, you select the messages text and click on
- * "forwarded"; you won't expect other data to be send to the new recipient,
+ * "forwared"; you won't expect other data to be send to the new recipient,
  * esp. as the new recipient may not be in any relationship to the original author)
  *
  * @memberof dc_msg_t
@@ -4098,19 +4029,9 @@ int             dc_msg_get_info_type          (const dc_msg_t* msg);
 
 
 // DC_INFO* uses the same values as SystemMessage in rust-land
-#define         DC_INFO_UNKNOWN                    0
-#define         DC_INFO_GROUP_NAME_CHANGED         2
-#define         DC_INFO_GROUP_IMAGE_CHANGED        3
-#define         DC_INFO_MEMBER_ADDED_TO_GROUP      4
-#define         DC_INFO_MEMBER_REMOVED_FROM_GROUP  5
-#define         DC_INFO_AUTOCRYPT_SETUP_MESSAGE    6
-#define         DC_INFO_SECURE_JOIN_MESSAGE        7
-#define         DC_INFO_LOCATIONSTREAMING_ENABLED  8
-#define         DC_INFO_LOCATION_ONLY              9
-#define         DC_INFO_EPHEMERAL_TIMER_CHANGED   10
-#define         DC_INFO_PROTECTION_ENABLED        11
-#define         DC_INFO_PROTECTION_DISABLED       12
-#define         DC_INFO_WEBXDC_INFO_MESSAGE       32
+#define         DC_INFO_PROTECTION_ENABLED     11
+#define         DC_INFO_PROTECTION_DISABLED    12
+
 
 /**
  * Check if a message is still in creation. A message is in creation between
@@ -4693,22 +4614,6 @@ char*           dc_contact_get_status        (const dc_contact_t* contact);
  */
 int64_t         dc_contact_get_last_seen     (const dc_contact_t* contact);
 
-
-/**
- * Check if the contact was seen recently.
- *
- * The UI may highlight these contacts,
- * eg. draw a little green dot on the avatars of the users recently seen.
- * DC_CONTACT_ID_SELF and other special contact IDs are defined as never seen recently (they should not get a dot).
- * To get the time a contact was seen, use dc_contact_get_last_seen().
- *
- * @memberof dc_contact_t
- * @param contact The contact object.
- * @return 1=contact seen recently, 0=contact not seen recently.
- */
-int             dc_contact_was_seen_recently (const dc_contact_t* contact);
-
-
 /**
  * Check if a contact is blocked.
  *
@@ -4922,49 +4827,7 @@ uint32_t        dc_lot_get_id            (const dc_lot_t* lot);
  * @param lot The lot object.
  * @return The timestamp as defined by the creator of the object. 0 if there is not timestamp or on errors.
  */
-int64_t         dc_lot_get_timestamp     (const dc_lot_t* lot);
-
-
-/**
- * @class dc_reactions_t
- *
- * An object representing all reactions for a single message.
- */
-
-/**
- * Returns array of contacts which reacted to the given message.
- *
- * @memberof dc_reactions_t
- * @param reactions The object containing message reactions.
- * @return array of contact IDs. Use dc_array_get_cnt() to get array length and
- *         dc_array_get_id() to get the IDs. Should be freed using `dc_array_unref()` after usage.
- */
-dc_array_t*     dc_reactions_get_contacts(dc_reactions_t* reactions);
-
-
-/**
- * Returns a string containing space-separated reactions of a single contact.
- *
- * @memberof dc_reactions_t
- * @param reactions The object containing message reactions.
- * @param contact_id ID of the contact.
- * @return Space-separated list of emoji sequences, which could be empty.
- *         Returned string should not be modified and should be freed
- *         with dc_str_unref() after usage.
- */
-char*           dc_reactions_get_by_contact_id(dc_reactions_t* reactions, uint32_t contact_id);
-
-
-/**
- * Frees an object containing message reactions.
- *
- * Reactions objects are created by dc_get_msg_reactions().
- *
- * @memberof dc_reactions_t
- * @param reactions The object to free.
- *     If NULL is given, nothing is done.
- */
-void            dc_reactions_unref       (dc_reactions_t* reactions);
+int64_t          dc_lot_get_timestamp     (const dc_lot_t* lot);
 
 
 /**
@@ -5305,61 +5168,13 @@ void            dc_reactions_unref       (dc_reactions_t* reactions);
  */
 
 
-
-/**
- * @class dc_jsonrpc_instance_t
- *
- * Opaque object for using the json rpc api from the cffi bindings.
- */
-
-/**
- * Create the jsonrpc instance that is used to call the jsonrpc.
- *
- * @memberof dc_accounts_t
- * @param account_manager The accounts object as created by dc_accounts_new().
- * @return Returns the jsonrpc instance, NULL on errors.
- *     Must be freed using dc_jsonrpc_unref() after usage.
- *
- */
-dc_jsonrpc_instance_t* dc_jsonrpc_init(dc_accounts_t* account_manager);
-
-/**
- * Free a jsonrpc instance.
- *
- * @memberof dc_jsonrpc_instance_t
- * @param jsonrpc_instance jsonrpc instance as returned from dc_jsonrpc_init().
- *     If NULL is given, nothing is done and an error is logged.
- */
-void dc_jsonrpc_unref(dc_jsonrpc_instance_t* jsonrpc_instance);
-
-/**
- * Makes an asynchronous jsonrpc request,
- * returns immediately and once the result is ready it can be retrieved via dc_jsonrpc_next_response()
- * the jsonrpc specification defines an invocation id that can then be used to match request and response.
- *
- * @memberof dc_jsonrpc_instance_t
- * @param jsonrpc_instance jsonrpc instance as returned from dc_jsonrpc_init().
- * @param request JSON-RPC request as string
- */
-void dc_jsonrpc_request(dc_jsonrpc_instance_t* jsonrpc_instance, const char* request);
-
-/**
- * Get the next json_rpc response, blocks until there is a new event, so call this in a loop from a thread.
- *
- * @memberof dc_jsonrpc_instance_t
- * @param jsonrpc_instance jsonrpc instance as returned from dc_jsonrpc_init().
- * @return JSON-RPC response as string, must be freed using dc_str_unref() after usage.
- *     If NULL is returned, the accounts_t belonging to the jsonrpc instance is unref'd and no more events will come;
- *     in this case, free the jsonrpc instance using dc_jsonrpc_unref().
- */
-char* dc_jsonrpc_next_response(dc_jsonrpc_instance_t* jsonrpc_instance);
-
 /**
  * @class dc_event_emitter_t
  *
  * Opaque object that is used to get events from a single context.
- * You can get an event emitter from a context using dc_get_event_emitter()
- * or dc_accounts_get_event_emitter().
+ * You can get an event emitter from a context using dc_get_event_emitter().
+ * If you are using the dc_accounts_t account manager,
+ * dc_accounts_event_emitter_t must be used instead.
  */
 
 /**
@@ -5375,8 +5190,6 @@ char* dc_jsonrpc_next_response(dc_jsonrpc_instance_t* jsonrpc_instance);
  */
 dc_event_t* dc_get_next_event(dc_event_emitter_t* emitter);
 
-// Alias for backwards compatibility, use dc_get_next_event instead.
-#define dc_accounts_get_next_event dc_get_next_event
 
 /**
  * Free a context event emitter object.
@@ -5387,8 +5200,39 @@ dc_event_t* dc_get_next_event(dc_event_emitter_t* emitter);
  */
 void  dc_event_emitter_unref(dc_event_emitter_t* emitter);
 
-// Alias for backwards compatibility, use dc_event_emtitter_unref instead.
-#define dc_accounts_event_emitter_unref dc_event_emitter_unref
+
+/**
+ * @class dc_accounts_event_emitter_t
+ *
+ * Opaque object that is used to get events from the dc_accounts_t account manager.
+ * You get an event emitter from the account manager using dc_accounts_get_event_emitter().
+ * If you are not using the dc_accounts_t account manager but just a single dc_context_t object,
+ * dc_event_emitter_t must be used instead.
+ */
+
+/**
+ * Get the next event from an accounts event emitter object.
+ *
+ * @memberof dc_accounts_event_emitter_t
+ * @param emitter Event emitter object as returned from dc_accounts_get_event_emitter().
+ * @return An event as an dc_event_t object.
+ *     You can query the event for information using dc_event_get_id(), dc_event_get_data1_int() and so on;
+ *     if you are done with the event, you have to free the event using dc_event_unref().
+ *     If NULL is returned, the contexts belonging to the event emitter are unref'd and no more events will come;
+ *     in this case, free the event emitter using dc_accounts_event_emitter_unref().
+ */
+dc_event_t* dc_accounts_get_next_event (dc_accounts_event_emitter_t* emitter);
+
+
+/**
+ * Free an accounts event emitter object.
+ *
+ * @memberof dc_accounts_event_emitter_t
+ * @param emitter Event emitter object as returned from dc_accounts_get_event_emitter().
+ *     If NULL is given, nothing is done and an error is logged.
+ */
+void dc_accounts_event_emitter_unref(dc_accounts_event_emitter_t* emitter);
+
 
 /**
  * @class dc_event_t
@@ -5460,7 +5304,7 @@ char* dc_event_get_data2_str(dc_event_t* event);
  * To get the context object belonging to the event, use dc_accounts_get_account().
  *
  * @memberof dc_event_t
- * @param event The event object as returned from dc_get_next_event().
+ * @param event The event object as returned from dc_accounts_get_next_event().
  * @return The account ID belonging to the event, 0 for account manager errors.
  */
 uint32_t dc_event_get_account_id(dc_event_t* event);
@@ -5615,15 +5459,6 @@ void dc_event_unref(dc_event_t* event);
 #define DC_EVENT_MSGS_CHANGED             2000
 
 
-/**
- * Message reactions changed.
- *
- * @param data1 (int) chat_id ID of the chat affected by the changes.
- * @param data2 (int) msg_id ID of the message for which reactions were changed.
- */
-#define DC_EVENT_REACTIONS_CHANGED        2001
-
-
 /**
  * There is a fresh message. Typically, the user will show an notification
  * when receiving this message.
@@ -5635,17 +5470,6 @@ void dc_event_unref(dc_event_t* event);
  */
 #define DC_EVENT_INCOMING_MSG             2005
 
-/**
- * Downloading a bunch of messages just finished. This is an experimental
- * event to allow the UI to only show one notification per message bunch,
- * instead of cluttering the user with many notifications.
- * For each of the msg_ids, an additional #DC_EVENT_INCOMING_MSG event was emitted before.
- * 
- * @param data1 0
- * @param data2 (char*) msg_ids, a json object with the message ids.
- */
-#define DC_EVENT_INCOMING_MSG_BUNCH       2006
-
 
 /**
  * Messages were marked noticed or seen.
@@ -5830,15 +5654,7 @@ void dc_event_unref(dc_event_t* event);
  * @param data1 (int) msg_id
  * @param data2 (int) status_update_serial - must not be used by UI implementations.
  */
-#define DC_EVENT_WEBXDC_STATUS_UPDATE             2120
-
-/**
- * Message deleted which contained a webxdc instance.
- *
- * @param data1 (int) msg_id
- */
-
-#define DC_EVENT_WEBXDC_INSTANCE_DELETED          2121
+#define DC_EVENT_WEBXDC_STATUS_UPDATE                2120
 
 
 /**
@@ -6072,38 +5888,28 @@ void dc_event_unref(dc_event_t* event);
 /// Used in status messages for group name changes.
 /// - %1$s will be replaced by the old group name
 /// - %2$s will be replaced by the new group name
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGGRPNAME                 15
 
 /// "Group image changed."
 ///
 /// Used in status messages for group images changes.
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGGRPIMGCHANGED           16
 
 /// "Member %1$s added."
 ///
 /// Used in status messages for added members.
 /// - %1$s will be replaced by the name of the added member
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGADDMEMBER               17
 
 /// "Member %1$s removed."
 ///
 /// Used in status messages for removed members.
 /// - %1$s will be replaced by the name of the removed member
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGDELMEMBER               18
 
 /// "Group left."
 ///
 /// Used in status messages.
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGGROUPLEFT               19
 
 /// "GIF"
@@ -6150,7 +5956,9 @@ void dc_event_unref(dc_event_t* event);
 /// - %1$s will be replaced by the subject of the displayed message
 #define DC_STR_READRCPT_MAILBODY          32
 
-/// @deprecated Deprecated, this string is no longer needed.
+/// "Group image deleted."
+///
+/// Used in status messages for deleted group images.
 #define DC_STR_MSGGRPIMGDELETED           33
 
 /// "End-to-end encryption preferred."
@@ -6203,8 +6011,6 @@ void dc_event_unref(dc_event_t* event);
 /// - %1$s will be replaced by an action
 ///   as #DC_STR_MSGADDMEMBER or #DC_STR_MSGGRPIMGCHANGED (full-stop removed, if any)
 /// - %2$s will be replaced by the name of the user taking that action
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGACTIONBYUSER            62
 
 /// "%1$s by me"
@@ -6212,8 +6018,6 @@ void dc_event_unref(dc_event_t* event);
 /// Used to concretize actions.
 /// - %1$s will be replaced by an action
 ///   as #DC_STR_MSGADDMEMBER or #DC_STR_MSGGRPIMGCHANGED (full-stop removed, if any)
-///
-/// @deprecated 2022-09-10
 #define DC_STR_MSGACTIONBYME              63
 
 /// "Location streaming enabled."
@@ -6277,8 +6081,6 @@ void dc_event_unref(dc_event_t* event);
 /// "Message deletion timer is disabled."
 ///
 /// Used in status messages.
-///
-/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_DISABLED         75
 
 /// "Message deletion timer is set to %1$s s."
@@ -6286,36 +6088,26 @@ void dc_event_unref(dc_event_t* event);
 /// Used in status messages when the other constants
 /// (#DC_STR_EPHEMERAL_MINUTE, #DC_STR_EPHEMERAL_HOUR and so on) do not match the timer.
 /// - %1$s will be replaced by the number of seconds the timer is set to
-///
-/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_SECONDS          76
 
 /// "Message deletion timer is set to 1 minute."
 ///
 /// Used in status messages.
-///
-/// @deperecated 2022-09-10
 #define DC_STR_EPHEMERAL_MINUTE           77
 
 /// "Message deletion timer is set to 1 hour."
 ///
 /// Used in status messages.
-///
-/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_HOUR             78
 
 /// "Message deletion timer is set to 1 day."
 ///
 /// Used in status messages.
-///
-/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_DAY              79
 
 /// "Message deletion timer is set to 1 week."
 ///
 /// Used in status messages.
-///
-/// @deprecated 2022-09-10
 #define DC_STR_EPHEMERAL_WEEK             80
 
 /// @deprecated Deprecated 2021-01-30, DC_STR_EPHEMERAL_WEEKS is used instead.
@@ -6356,11 +6148,12 @@ void dc_event_unref(dc_event_t* event);
 
 /// "Chat protection enabled."
 ///
-
-/// @deprecated Deprecated, replaced by DC_STR_MSG_YOU_ENABLED_PROTECTION and DC_STR_MSG_PROTECTION_ENABLED_BY.
+/// Used in status messages.
 #define DC_STR_PROTECTION_ENABLED         88
 
-/// @deprecated Deprecated, replaced by DC_STR_MSG_YOU_DISABLED_PROTECTION and DC_STR_MSG_PROTECTION_DISABLED_BY.
+/// "Chat protection disabled."
+///
+/// Used in status messages.
 #define DC_STR_PROTECTION_DISABLED        89
 
 /// "Reply"
@@ -6382,37 +6175,29 @@ void dc_event_unref(dc_event_t* event);
 /// "Message deletion timer is set to %1$s minutes."
 ///
 /// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of minutes (always >1) the timer is set to.
-///
-/// @deprecated Replaced by DC_STR_MSG_YOU_EPHEMERAL_TIMER_MINUTES and DC_STR_MSG_EPHEMERAL_TIMER_MINUTES_BY.
+//
+/// `%1$s` will be replaced by the number of minutes (alwasy >1) the timer is set to.
 #define DC_STR_EPHEMERAL_MINUTES          93
 
 /// "Message deletion timer is set to %1$s hours."
 ///
 /// Used in status messages.
-///
+//
 /// `%1$s` will be replaced by the number of hours (always >1) the timer is set to.
-///
-/// @deprecated Replaced by DC_STR_MSG_YOU_EPHEMERAL_TIMER_HOURS and DC_STR_MSG_EPHEMERAL_TIMER_HOURS_BY.
 #define DC_STR_EPHEMERAL_HOURS            94
 
 /// "Message deletion timer is set to %1$s days."
 ///
 /// Used in status messages.
-///
+//
 /// `%1$s` will be replaced by the number of days (always >1) the timer is set to.
-///
-/// @deprecated Replaced by DC_STR_MSG_YOU_EPHEMERAL_TIMER_DAYS and DC_STR_MSG_EPHEMERAL_TIMER_DAYS_BY.
 #define DC_STR_EPHEMERAL_DAYS             95
 
 /// "Message deletion timer is set to %1$s weeks."
 ///
 /// Used in status messages.
-///
+//
 /// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to.
-///
-/// @deprecated Replaced by DC_STR_MSG_YOU_EPHEMERAL_TIMER_WEEKS and DC_STR_MSG_EPHEMERAL_TIMER_WEEKS_BY.
 #define DC_STR_EPHEMERAL_WEEKS            96
 
 /// "Forwarded"
@@ -6569,264 +6354,6 @@ void dc_event_unref(dc_event_t* event);
 /// Used as status in the connectivity view.
 #define DC_STR_NOT_CONNECTED              121
 
-/// "%1$s changed their address from %2$s to %3$s"
-///
-/// Used as an info message to chats with contacts that changed their address.
-#define DC_STR_AEAP_ADDR_CHANGED          122
-
-/// "You changed your email address from %1$s to %2$s.
-/// If you now send a message to a group, contacts there will automatically
-/// replace the old with your new address.\n\nIt's highly advised to set up 
-/// your old email provider to forward all emails to your new email address. 
-/// Otherwise you might miss messages of contacts who did not get your new 
-/// address yet." + the link to the AEAP blog post
-/// 
-/// As soon as there is a post about AEAP, the UIs should add it:
-/// set_stock_translation(123, getString(aeap_explanation) + "\n\n" + AEAP_BLOG_LINK)
-///
-/// Used in a device message that explains AEAP.
-#define DC_STR_AEAP_EXPLANATION_AND_LINK  123
-
-/// "You changed group name from \"%1$s\" to \"%2$s\"."
-///
-/// `%1$s` will be replaced by the old group name.
-/// `%2$s` will be replaced by the new group name.
-#define DC_STR_GROUP_NAME_CHANGED_BY_YOU 124
-
-/// "Group name changed from \"%1$s\" to \"%2$s\" by %3$s."
-///
-/// `%1$s` will be replaced by the old group name.
-/// `%2$s` will be replaced by the new group name.
-/// `%3$s` will be replaced by name and address of the contact who did the action.
-#define DC_STR_GROUP_NAME_CHANGED_BY_OTHER 125
-
-/// "You changed the group image."
-#define DC_STR_GROUP_IMAGE_CHANGED_BY_YOU 126
-
-/// "Group image changed by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact who did the action.
-#define DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER 127
-
-/// "You added member %1$s."
-///
-/// Used in status messages.
-#define DC_STR_ADD_MEMBER_BY_YOU 128
-
-/// "Member %1$s added by %2$s."
-///
-/// `%1$s` will be replaced by name and address of the contact added to the group.
-/// `%2$s` will be replaced by name and address of the contact who did the action.
-///
-/// Used in status messages.
-#define DC_STR_ADD_MEMBER_BY_OTHER 129
-
-/// "You removed member %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact removed from the group.
-///
-/// Used in status messages.
-#define DC_STR_REMOVE_MEMBER_BY_YOU 130
-
-/// "Member %1$s removed by %2$s."
-///
-/// `%1$s` will be replaced by name and address of the contact removed from the group.
-/// `%2$s` will be replaced by name and address of the contact who did the action.
-///
-/// Used in status messages.
-#define DC_STR_REMOVE_MEMBER_BY_OTHER 131
-
-/// "You left the group."
-///
-/// Used in status messages.
-#define DC_STR_GROUP_LEFT_BY_YOU 132
-
-/// "Group left by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_GROUP_LEFT_BY_OTHER 133
-
-/// "You deleted the group image."
-///
-/// Used in status messages.
-#define DC_STR_GROUP_IMAGE_DELETED_BY_YOU 134
-
-/// "Group image deleted by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_GROUP_IMAGE_DELETED_BY_OTHER 135
-
-/// "You enabled location streaming."
-///
-/// Used in status messages.
-#define DC_STR_LOCATION_ENABLED_BY_YOU 136
-
-/// "Location streaming enabled by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_LOCATION_ENABLED_BY_OTHER 137
-
-/// "You disabled message deletion timer."
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_DISABLED_BY_YOU 138
-
-/// "Message deletion timer is disabled by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER 139
-
-/// "You set message deletion timer to %1$s s."
-///
-/// `%1$s` will be replaced by the number of seconds (always >1) the timer is set to.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_SECONDS_BY_YOU 140
-
-/// "Message deletion timer is set to %1$s s by %2$s."
-///
-/// `%1$s` will be replaced by the number of seconds (always >1) the timer is set to.
-/// `%2$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER 141
-
-/// "You set message deletion timer to 1 minute."
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_YOU 142
-
-/// "Message deletion timer is set to 1 minute by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER 143
-
-/// "You set message deletion timer to 1 hour."
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_YOU 144
-
-/// "Message deletion timer is set to 1 hour by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER 145
-
-/// "You set message deletion timer to 1 day."
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_DAY_BY_YOU 146
-
-/// "Message deletion timer is set to 1 day by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER 147
-
-/// "You set message deletion timer to 1 week."
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_YOU 148
-
-/// "Message deletion timer is set to 1 week by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER 149
-
-/// "You set message deletion timer to %1$s minutes."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of minutes (always >1) the timer is set to.
-#define DC_STR_EPHEMERAL_TIMER_MINUTES_BY_YOU 150
-
-/// "Message deletion timer is set to %1$s minutes by %2$s."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of minutes (always >1) the timer is set to.
-/// `%2$s` will be replaced by name and address of the contact.
-#define DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER 151
-
-/// "You set message deletion timer to %1$s hours."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of hours (always >1) the timer is set to.
-#define DC_STR_EPHEMERAL_TIMER_HOURS_BY_YOU 152
-
-/// "Message deletion timer is set to %1$s hours by %2$s."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of hours (always >1) the timer is set to.
-/// `%2$s` will be replaced by name and address of the contact.
-#define DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER 153
-
-/// "You set message deletion timer to %1$s days."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of days (always >1) the timer is set to.
-#define DC_STR_EPHEMERAL_TIMER_DAYS_BY_YOU 154
-
-/// "Message deletion timer is set to %1$s days by %2$s."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of days (always >1) the timer is set to.
-/// `%2$s` will be replaced by name and address of the contact.
-#define DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER 155
-
-/// "You set message deletion timer to %1$s weeks."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to.
-#define DC_STR_EPHEMERAL_TIMER_WEEKS_BY_YOU 156
-
-/// "Message deletion timer is set to %1$s weeks by %2$s."
-///
-/// Used in status messages.
-///
-/// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to.
-/// `%2$s` will be replaced by name and address of the contact.
-#define DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER 157
-
-/// "You enabled chat protection."
-///
-/// Used in status messages.
-#define DC_STR_PROTECTION_ENABLED_BY_YOU 158
-
-/// "Chat protection enabled by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-///
-/// Used in status messages.
-#define DC_STR_PROTECTION_ENABLED_BY_OTHER 159
-
-/// "You disabled chat protection."
-#define DC_STR_PROTECTION_DISABLED_BY_YOU 160
-
-/// "Chat protection disabled by %1$s."
-///
-/// `%1$s` will be replaced by name and address of the contact.
-#define DC_STR_PROTECTION_DISABLED_BY_OTHER 161
-
 /**
  * @}
  */

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

@@ -1,4 +1,4 @@
-#![warn(unused, clippy::all)]
+#![deny(clippy::all)]
 #![allow(
     non_camel_case_types,
     non_snake_case,
@@ -11,24 +11,23 @@
 
 #[macro_use]
 extern crate human_panic;
+extern crate num_traits;
+extern crate serde_json;
 
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
 use std::fmt::Write;
-use std::future::Future;
 use std::ops::Deref;
 use std::ptr;
 use std::str::FromStr;
-use std::sync::Arc;
 use std::time::{Duration, SystemTime};
 
 use anyhow::Context as _;
+use async_std::sync::RwLock;
+use async_std::task::{block_on, spawn};
 use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use num_traits::{FromPrimitive, ToPrimitive};
-use once_cell::sync::Lazy;
 use rand::Rng;
-use tokio::runtime::Runtime;
-use tokio::sync::RwLock;
 
 use deltachat::chat::{ChatId, ChatVisibility, MuteDuration, ProtectionStatus};
 use deltachat::constants::DC_MSG_ID_LAST_SPECIAL;
@@ -37,13 +36,10 @@ use deltachat::context::Context;
 use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::key::DcKey;
 use deltachat::message::MsgId;
-use deltachat::reaction::{get_msg_reactions, send_reaction, Reactions};
 use deltachat::stock_str::StockMessage;
-use deltachat::stock_str::StockStrings;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
-use tokio::task::JoinHandle;
 
 mod dc_array;
 mod lot;
@@ -67,25 +63,6 @@ use deltachat::chatlist::Chatlist;
 /// Struct representing the deltachat context.
 pub type dc_context_t = Context;
 
-pub type dc_reactions_t = Reactions;
-
-static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("unable to create tokio runtime"));
-
-fn block_on<T>(fut: T) -> T::Output
-where
-    T: Future,
-{
-    RT.block_on(fut)
-}
-
-fn spawn<T>(fut: T) -> JoinHandle<T::Output>
-where
-    T: Future + Send + 'static,
-    T::Output: Send + 'static,
-{
-    RT.spawn(fut)
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_context_new(
     _os_name: *const libc::c_char,
@@ -102,12 +79,7 @@ pub unsafe extern "C" fn dc_context_new(
     let ctx = if blobdir.is_null() || *blobdir == 0 {
         // generate random ID as this functionality is not yet available on the C-api.
         let id = rand::thread_rng().gen();
-        block_on(Context::new(
-            as_path(dbfile),
-            id,
-            Events::new(),
-            StockStrings::new(),
-        ))
+        block_on(Context::new(as_path(dbfile).to_path_buf().into(), id))
     } else {
         eprintln!("blobdir can not be defined explicitly anymore");
         return ptr::null_mut();
@@ -132,10 +104,8 @@ pub unsafe extern "C" fn dc_context_new_closed(dbfile: *const libc::c_char) -> *
 
     let id = rand::thread_rng().gen();
     match block_on(Context::new_closed(
-        as_path(dbfile),
+        as_path(dbfile).to_path_buf().into(),
         id,
-        Events::new(),
-        StockStrings::new(),
     )) {
         Ok(context) => Box::into_raw(Box::new(context)),
         Err(err) => {
@@ -183,7 +153,7 @@ pub unsafe extern "C" fn dc_context_unref(context: *mut dc_context_t) {
         eprintln!("ignoring careless call to dc_context_unref()");
         return;
     }
-    drop(Box::from_raw(context));
+    Box::from_raw(context);
 }
 
 #[no_mangle]
@@ -410,7 +380,7 @@ pub unsafe extern "C" fn dc_get_oauth2_url(
     let redirect = to_string_lossy(redirect);
 
     block_on(async move {
-        match oauth2::get_oauth2_url(ctx, &addr, &redirect)
+        match oauth2::dc_get_oauth2_url(ctx, &addr, &redirect)
             .await
             .log_err(ctx, "dc_get_oauth2_url failed")
         {
@@ -477,7 +447,7 @@ pub unsafe extern "C" fn dc_event_unref(a: *mut dc_event_t) {
         return;
     }
 
-    drop(Box::from_raw(a));
+    Box::from_raw(a);
 }
 
 #[no_mangle]
@@ -488,40 +458,7 @@ pub unsafe extern "C" fn dc_event_get_id(event: *mut dc_event_t) -> libc::c_int
     }
 
     let event = &*event;
-    match event.typ {
-        EventType::Info(_) => 100,
-        EventType::SmtpConnected(_) => 101,
-        EventType::ImapConnected(_) => 102,
-        EventType::SmtpMessageSent(_) => 103,
-        EventType::ImapMessageDeleted(_) => 104,
-        EventType::ImapMessageMoved(_) => 105,
-        EventType::NewBlobFile(_) => 150,
-        EventType::DeletedBlobFile(_) => 151,
-        EventType::Warning(_) => 300,
-        EventType::Error(_) => 400,
-        EventType::ErrorSelfNotInGroup(_) => 410,
-        EventType::MsgsChanged { .. } => 2000,
-        EventType::ReactionsChanged { .. } => 2001,
-        EventType::IncomingMsg { .. } => 2005,
-        EventType::IncomingMsgBunch { .. } => 2006,
-        EventType::MsgsNoticed { .. } => 2008,
-        EventType::MsgDelivered { .. } => 2010,
-        EventType::MsgFailed { .. } => 2012,
-        EventType::MsgRead { .. } => 2015,
-        EventType::ChatModified(_) => 2020,
-        EventType::ChatEphemeralTimerModified { .. } => 2021,
-        EventType::ContactsChanged(_) => 2030,
-        EventType::LocationChanged(_) => 2035,
-        EventType::ConfigureProgress { .. } => 2041,
-        EventType::ImexProgress(_) => 2051,
-        EventType::ImexFileWritten(_) => 2052,
-        EventType::SecurejoinInviterProgress { .. } => 2060,
-        EventType::SecurejoinJoinerProgress { .. } => 2061,
-        EventType::ConnectivityChanged => 2100,
-        EventType::SelfavatarChanged => 2110,
-        EventType::WebxdcStatusUpdate { .. } => 2120,
-        EventType::WebxdcInstanceDeleted { .. } => 2121,
-    }
+    event.as_id()
 }
 
 #[no_mangle]
@@ -545,10 +482,8 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
         | EventType::Error(_)
         | EventType::ConnectivityChanged
         | EventType::SelfavatarChanged
-        | EventType::IncomingMsgBunch { .. }
         | EventType::ErrorSelfNotInGroup(_) => 0,
         EventType::MsgsChanged { chat_id, .. }
-        | EventType::ReactionsChanged { chat_id, .. }
         | EventType::IncomingMsg { chat_id, .. }
         | EventType::MsgsNoticed(chat_id)
         | EventType::MsgDelivered { chat_id, .. }
@@ -569,7 +504,6 @@ pub unsafe extern "C" fn dc_event_get_data1_int(event: *mut dc_event_t) -> libc:
             contact_id.to_u32() as libc::c_int
         }
         EventType::WebxdcStatusUpdate { msg_id, .. } => msg_id.to_u32() as libc::c_int,
-        EventType::WebxdcInstanceDeleted { msg_id, .. } => msg_id.to_u32() as libc::c_int,
     }
 }
 
@@ -601,12 +535,9 @@ pub unsafe extern "C" fn dc_event_get_data2_int(event: *mut dc_event_t) -> libc:
         | EventType::ImexFileWritten(_)
         | EventType::MsgsNoticed(_)
         | EventType::ConnectivityChanged
-        | EventType::WebxdcInstanceDeleted { .. }
-        | EventType::IncomingMsgBunch { .. }
         | EventType::SelfavatarChanged => 0,
         EventType::ChatModified(_) => 0,
         EventType::MsgsChanged { msg_id, .. }
-        | EventType::ReactionsChanged { msg_id, .. }
         | EventType::IncomingMsg { msg_id, .. }
         | EventType::MsgDelivered { msg_id, .. }
         | EventType::MsgFailed { msg_id, .. }
@@ -646,7 +577,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
             data2.into_raw()
         }
         EventType::MsgsChanged { .. }
-        | EventType::ReactionsChanged { .. }
         | EventType::IncomingMsg { .. }
         | EventType::MsgsNoticed(_)
         | EventType::MsgDelivered { .. }
@@ -661,7 +591,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
         | EventType::ConnectivityChanged
         | EventType::SelfavatarChanged
         | EventType::WebxdcStatusUpdate { .. }
-        | EventType::WebxdcInstanceDeleted { .. }
         | EventType::ChatEphemeralTimerModified { .. } => ptr::null_mut(),
         EventType::ConfigureProgress { comment, .. } => {
             if let Some(comment) = comment {
@@ -674,11 +603,6 @@ pub unsafe extern "C" fn dc_event_get_data2_str(event: *mut dc_event_t) -> *mut
             let data2 = file.to_c_string().unwrap_or_default();
             data2.into_raw()
         }
-        EventType::IncomingMsgBunch { msg_ids } => serde_json::to_string(msg_ids)
-            .unwrap_or_default()
-            .to_c_string()
-            .unwrap_or_default()
-            .into_raw(),
     }
 }
 
@@ -713,7 +637,7 @@ pub unsafe extern "C" fn dc_event_emitter_unref(emitter: *mut dc_event_emitter_t
         return;
     }
 
-    drop(Box::from_raw(emitter));
+    Box::from_raw(emitter);
 }
 
 #[no_mangle]
@@ -724,13 +648,10 @@ pub unsafe extern "C" fn dc_get_next_event(events: *mut dc_event_emitter_t) -> *
     }
     let events = &*events;
 
-    block_on(async move {
-        events
-            .recv()
-            .await
-            .map(|ev| Box::into_raw(Box::new(ev)))
-            .unwrap_or_else(ptr::null_mut)
-    })
+    events
+        .recv_sync()
+        .map(|ev| Box::into_raw(Box::new(ev)))
+        .unwrap_or_else(ptr::null_mut)
 }
 
 #[no_mangle]
@@ -770,7 +691,7 @@ pub unsafe extern "C" fn dc_preconfigure_keypair(
     }
     let ctx = &*context;
     block_on(async move {
-        let addr = tools::EmailAddress::new(&to_string_lossy(addr))?;
+        let addr = dc_tools::EmailAddress::new(&to_string_lossy(addr))?;
         let public = key::SignedPublicKey::from_asc(&to_string_lossy(public_data))?.0;
         let secret = key::SignedSecretKey::from_asc(&to_string_lossy(secret_data))?.0;
         let keypair = key::KeyPair {
@@ -963,48 +884,6 @@ pub unsafe extern "C" fn dc_send_videochat_invitation(
     })
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_send_reaction(
-    context: *mut dc_context_t,
-    msg_id: u32,
-    reaction: *const libc::c_char,
-) -> u32 {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_send_reaction()");
-        return 0;
-    }
-    let ctx = &*context;
-
-    block_on(async move {
-        send_reaction(ctx, MsgId::new(msg_id), &to_string_lossy(reaction))
-            .await
-            .map(|msg_id| msg_id.to_u32())
-            .unwrap_or_log_default(ctx, "Failed to send reaction")
-    })
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_get_msg_reactions(
-    context: *mut dc_context_t,
-    msg_id: u32,
-) -> *mut dc_reactions_t {
-    if context.is_null() {
-        eprintln!("ignoring careless call to dc_get_msg_reactions()");
-        return ptr::null_mut();
-    }
-    let ctx = &*context;
-
-    let reactions = if let Ok(reactions) = block_on(get_msg_reactions(ctx, MsgId::new(msg_id)))
-        .log_err(ctx, "failed dc_get_msg_reactions() call")
-    {
-        reactions
-    } else {
-        return ptr::null_mut();
-    };
-
-    Box::into_raw(Box::new(reactions))
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_send_webxdc_status_update(
     context: *mut dc_context_t,
@@ -1148,17 +1027,22 @@ pub unsafe extern "C" fn dc_get_chat_msgs(
     context: *mut dc_context_t,
     chat_id: u32,
     flags: u32,
-    _marker1before: u32,
+    marker1before: u32,
 ) -> *mut dc_array::dc_array_t {
     if context.is_null() {
         eprintln!("ignoring careless call to dc_get_chat_msgs()");
         return ptr::null_mut();
     }
     let ctx = &*context;
+    let marker_flag = if marker1before <= DC_MSG_ID_LAST_SPECIAL {
+        None
+    } else {
+        Some(MsgId::new(marker1before))
+    };
 
     block_on(async move {
         Box::into_raw(Box::new(
-            chat::get_chat_msgs(ctx, ChatId::new(chat_id), flags)
+            chat::get_chat_msgs(ctx, ChatId::new(chat_id), flags, marker_flag)
                 .await
                 .unwrap_or_log_default(ctx, "failed to get chat msgs")
                 .into(),
@@ -1280,11 +1164,6 @@ pub unsafe extern "C" fn dc_get_chat_media(
         return ptr::null_mut();
     }
     let ctx = &*context;
-    let chat_id = if chat_id == 0 {
-        None
-    } else {
-        Some(ChatId::new(chat_id))
-    };
     let msg_type = from_prim(msg_type).expect(&format!("invalid msg_type = {}", msg_type));
     let or_msg_type2 =
         from_prim(or_msg_type2).expect(&format!("incorrect or_msg_type2 = {}", or_msg_type2));
@@ -1293,10 +1172,16 @@ pub unsafe extern "C" fn dc_get_chat_media(
 
     block_on(async move {
         Box::into_raw(Box::new(
-            chat::get_chat_media(ctx, chat_id, msg_type, or_msg_type2, or_msg_type3)
-                .await
-                .unwrap_or_log_default(ctx, "Failed get_chat_media")
-                .into(),
+            chat::get_chat_media(
+                ctx,
+                ChatId::new(chat_id),
+                msg_type,
+                or_msg_type2,
+                or_msg_type3,
+            )
+            .await
+            .unwrap_or_log_default(ctx, "Failed get_chat_media")
+            .into(),
         ))
     })
 }
@@ -1659,7 +1544,7 @@ pub unsafe extern "C" fn dc_set_chat_profile_image(
     let ctx = &*context;
 
     block_on(async move {
-        chat::set_chat_profile_image(ctx, ChatId::new(chat_id), &to_string_lossy(image))
+        chat::set_chat_profile_image(ctx, ChatId::new(chat_id), to_string_lossy(image))
             .await
             .map(|_| 1)
             .unwrap_or_log_default(ctx, "Failed to set profile image")
@@ -2034,7 +1919,7 @@ pub unsafe extern "C" fn dc_get_contacts(
     let query = to_opt_string_lossy(query);
 
     block_on(async move {
-        match Contact::get_all(ctx, flags, query.as_deref()).await {
+        match Contact::get_all(ctx, flags, query).await {
             Ok(contacts) => Box::into_raw(Box::new(dc_array_t::from(
                 contacts.iter().map(|id| id.to_u32()).collect::<Vec<u32>>(),
             ))),
@@ -2144,10 +2029,7 @@ pub unsafe extern "C" fn dc_delete_contact(
     block_on(async move {
         match Contact::delete(ctx, contact_id).await {
             Ok(_) => 1,
-            Err(err) => {
-                error!(ctx, "cannot delete contact: {}", err);
-                0
-            }
+            Err(_) => 0,
         }
     })
 }
@@ -2182,7 +2064,7 @@ pub unsafe extern "C" fn dc_imex(
         eprintln!("ignoring careless call to dc_imex()");
         return;
     }
-    let what = match imex::ImexMode::from_i32(what_raw) {
+    let what = match imex::ImexMode::from_i32(what_raw as i32) {
         Some(what) => what,
         None => {
             eprintln!("ignoring invalid argument {} to dc_imex", what_raw);
@@ -2253,7 +2135,10 @@ pub unsafe extern "C" fn dc_continue_key_transfer(
     msg_id: u32,
     setup_code: *const libc::c_char,
 ) -> libc::c_int {
-    if context.is_null() || msg_id <= constants::DC_MSG_ID_LAST_SPECIAL || setup_code.is_null() {
+    if context.is_null()
+        || msg_id <= constants::DC_MSG_ID_LAST_SPECIAL as u32
+        || setup_code.is_null()
+    {
         eprintln!("ignoring careless call to dc_continue_key_transfer()");
         return 0;
     }
@@ -2316,7 +2201,7 @@ pub unsafe extern "C" fn dc_get_securejoin_qr(
         Some(ChatId::new(chat_id))
     };
 
-    block_on(securejoin::get_securejoin_qr(ctx, chat_id))
+    block_on(securejoin::dc_get_securejoin_qr(ctx, chat_id))
         .unwrap_or_else(|_| "".to_string())
         .strdup()
 }
@@ -2354,7 +2239,7 @@ pub unsafe extern "C" fn dc_join_securejoin(
     let ctx = &*context;
 
     block_on(async move {
-        securejoin::join_securejoin(ctx, &to_string_lossy(qr))
+        securejoin::dc_join_securejoin(ctx, &to_string_lossy(qr))
             .await
             .map(|chatid| chatid.to_u32())
             .log_err(ctx, "failed dc_join_securejoin() call")
@@ -2444,9 +2329,15 @@ pub unsafe extern "C" fn dc_get_locations(
     };
 
     block_on(async move {
-        let res = location::get_range(ctx, chat_id, contact_id, timestamp_begin, timestamp_end)
-            .await
-            .unwrap_or_log_default(ctx, "Failed get_locations");
+        let res = location::get_range(
+            ctx,
+            chat_id,
+            contact_id,
+            timestamp_begin as i64,
+            timestamp_end as i64,
+        )
+        .await
+        .unwrap_or_log_default(ctx, "Failed get_locations");
         Box::into_raw(Box::new(dc_array_t::from(res)))
     })
 }
@@ -2474,7 +2365,7 @@ pub unsafe extern "C" fn dc_get_last_error(context: *mut dc_context_t) -> *mut l
         return "".strdup();
     }
     let ctx = &*context;
-    ctx.get_last_error().strdup()
+    block_on(ctx.get_last_error()).strdup()
 }
 
 // dc_array_t
@@ -2488,7 +2379,7 @@ pub unsafe extern "C" fn dc_array_unref(a: *mut dc_array::dc_array_t) {
         return;
     }
 
-    drop(Box::from_raw(a));
+    Box::from_raw(a);
 }
 
 #[no_mangle]
@@ -2669,7 +2560,7 @@ pub unsafe extern "C" fn dc_chatlist_unref(chatlist: *mut dc_chatlist_t) {
         eprintln!("ignoring careless call to dc_chatlist_unref()");
         return;
     }
-    drop(Box::from_raw(chatlist));
+    Box::from_raw(chatlist);
 }
 
 #[no_mangle]
@@ -2693,7 +2584,7 @@ pub unsafe extern "C" fn dc_chatlist_get_chat_id(
     }
     let ffi_list = &*chatlist;
     let ctx = &*ffi_list.context;
-    match ffi_list.list.get_chat_id(index) {
+    match ffi_list.list.get_chat_id(index as usize) {
         Ok(chat_id) => chat_id.to_u32(),
         Err(err) => {
             warn!(ctx, "get_chat_id failed: {}", err);
@@ -2713,7 +2604,7 @@ pub unsafe extern "C" fn dc_chatlist_get_msg_id(
     }
     let ffi_list = &*chatlist;
     let ctx = &*ffi_list.context;
-    match ffi_list.list.get_msg_id(index) {
+    match ffi_list.list.get_msg_id(index as usize) {
         Ok(msg_id) => msg_id.map_or(0, |msg_id| msg_id.to_u32()),
         Err(err) => {
             warn!(ctx, "get_msg_id failed: {}", err);
@@ -2744,7 +2635,7 @@ pub unsafe extern "C" fn dc_chatlist_get_summary(
     block_on(async move {
         let summary = ffi_list
             .list
-            .get_summary(ctx, index, maybe_chat)
+            .get_summary(ctx, index as usize, maybe_chat)
             .await
             .log_err(ctx, "get_summary failed")
             .unwrap_or_default();
@@ -2814,7 +2705,7 @@ pub unsafe extern "C" fn dc_chat_unref(chat: *mut dc_chat_t) {
         return;
     }
 
-    drop(Box::from_raw(chat));
+    Box::from_raw(chat);
 }
 
 #[no_mangle]
@@ -2847,20 +2738,6 @@ pub unsafe extern "C" fn dc_chat_get_name(chat: *mut dc_chat_t) -> *mut libc::c_
     ffi_chat.chat.get_name().strdup()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_chat_get_mailinglist_addr(chat: *mut dc_chat_t) -> *mut libc::c_char {
-    if chat.is_null() {
-        eprintln!("ignoring careless call to dc_chat_get_mailinglist_addr()");
-        return "".strdup();
-    }
-    let ffi_chat = &*chat;
-    ffi_chat
-        .chat
-        .get_mailinglist_addr()
-        .unwrap_or_default()
-        .strdup()
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_chat_get_profile_image(chat: *mut dc_chat_t) -> *mut libc::c_char {
     if chat.is_null() {
@@ -3088,7 +2965,7 @@ pub unsafe extern "C" fn dc_msg_unref(msg: *mut dc_msg_t) {
         return;
     }
 
-    drop(Box::from_raw(msg));
+    Box::from_raw(msg);
 }
 
 #[no_mangle]
@@ -3674,8 +3551,7 @@ pub unsafe extern "C" fn dc_msg_latefiling_mediasize(
         ffi_msg
             .message
             .latefiling_mediasize(ctx, width, height, duration)
-    })
-    .ok_or_log_msg(ctx, "Cannot set media size");
+    });
 }
 
 #[no_mangle]
@@ -3810,7 +3686,7 @@ pub unsafe extern "C" fn dc_contact_unref(contact: *mut dc_contact_t) {
         eprintln!("ignoring careless call to dc_contact_unref()");
         return;
     }
-    drop(Box::from_raw(contact));
+    Box::from_raw(contact);
 }
 
 #[no_mangle]
@@ -3929,16 +3805,6 @@ pub unsafe extern "C" fn dc_contact_get_last_seen(contact: *mut dc_contact_t) ->
     ffi_contact.contact.last_seen()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_contact_was_seen_recently(contact: *mut dc_contact_t) -> libc::c_int {
-    if contact.is_null() {
-        eprintln!("ignoring careless call to dc_contact_was_seen_recently()");
-        return 0;
-    }
-    let ffi_contact = &*contact;
-    ffi_contact.contact.was_seen_recently() as libc::c_int
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_contact_is_blocked(contact: *mut dc_contact_t) -> libc::c_int {
     if contact.is_null() {
@@ -3974,7 +3840,7 @@ pub unsafe extern "C" fn dc_lot_unref(lot: *mut dc_lot_t) {
         return;
     }
 
-    drop(Box::from_raw(lot));
+    Box::from_raw(lot);
 }
 
 #[no_mangle]
@@ -4043,45 +3909,6 @@ pub unsafe extern "C" fn dc_lot_get_timestamp(lot: *mut dc_lot_t) -> i64 {
     lot.get_timestamp()
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_reactions_get_contacts(
-    reactions: *mut dc_reactions_t,
-) -> *mut dc_array::dc_array_t {
-    if reactions.is_null() {
-        eprintln!("ignoring careless call to dc_reactions_get_contacts()");
-        return ptr::null_mut();
-    }
-
-    let reactions = &*reactions;
-    let array: dc_array_t = reactions.contacts().into();
-
-    Box::into_raw(Box::new(array))
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_reactions_get_by_contact_id(
-    reactions: *mut dc_reactions_t,
-    contact_id: u32,
-) -> *mut libc::c_char {
-    if reactions.is_null() {
-        eprintln!("ignoring careless call to dc_reactions_get_by_contact_id()");
-        return ptr::null_mut();
-    }
-
-    let reactions = &*reactions;
-    reactions.get(ContactId::new(contact_id)).as_str().strdup()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_reactions_unref(reactions: *mut dc_reactions_t) {
-    if reactions.is_null() {
-        eprintln!("ignoring careless call to dc_reactions_unref()");
-        return;
-    }
-
-    drop(Box::from_raw(reactions));
-}
-
 #[no_mangle]
 pub unsafe extern "C" fn dc_str_unref(s: *mut libc::c_char) {
     libc::free(s as *mut _)
@@ -4237,11 +4064,11 @@ pub unsafe extern "C" fn dc_provider_unref(provider: *mut dc_provider_t) {
 /// Reader-writer lock wrapper for accounts manager to guarantee thread safety when using
 /// `dc_accounts_t` in multiple threads at once.
 pub struct AccountsWrapper {
-    inner: Arc<RwLock<Accounts>>,
+    inner: RwLock<Accounts>,
 }
 
 impl Deref for AccountsWrapper {
-    type Target = Arc<RwLock<Accounts>>;
+    type Target = RwLock<Accounts>;
 
     fn deref(&self) -> &Self::Target {
         &self.inner
@@ -4250,7 +4077,7 @@ impl Deref for AccountsWrapper {
 
 impl AccountsWrapper {
     fn new(accounts: Accounts) -> Self {
-        let inner = Arc::new(RwLock::new(accounts));
+        let inner = RwLock::new(accounts);
         Self { inner }
     }
 }
@@ -4270,7 +4097,7 @@ pub unsafe extern "C" fn dc_accounts_new(
         return ptr::null_mut();
     }
 
-    let accs = block_on(Accounts::new(as_path(dbfile).into()));
+    let accs = block_on(Accounts::new(as_path(dbfile).to_path_buf().into()));
 
     match accs {
         Ok(accs) => Box::into_raw(Box::new(AccountsWrapper::new(accs))),
@@ -4305,8 +4132,7 @@ pub unsafe extern "C" fn dc_accounts_get_account(
     }
 
     let accounts = &*accounts;
-    block_on(accounts.read())
-        .get_account(id)
+    block_on(async move { accounts.read().await.get_account(id).await })
         .map(|ctx| Box::into_raw(Box::new(ctx)))
         .unwrap_or_else(std::ptr::null_mut)
 }
@@ -4321,8 +4147,7 @@ pub unsafe extern "C" fn dc_accounts_get_selected_account(
     }
 
     let accounts = &*accounts;
-    block_on(accounts.read())
-        .get_selected_account()
+    block_on(async move { accounts.read().await.get_selected_account().await })
         .map(|ctx| Box::into_raw(Box::new(ctx)))
         .unwrap_or_else(std::ptr::null_mut)
 }
@@ -4444,7 +4269,7 @@ pub unsafe extern "C" fn dc_accounts_migrate_account(
     block_on(async move {
         let mut accounts = accounts.write().await;
         match accounts
-            .migrate_account(std::path::PathBuf::from(dbfile))
+            .migrate_account(async_std::path::PathBuf::from(dbfile))
             .await
         {
             Ok(id) => id,
@@ -4467,7 +4292,7 @@ pub unsafe extern "C" fn dc_accounts_get_all(accounts: *mut dc_accounts_t) -> *m
     }
 
     let accounts = &*accounts;
-    let list = block_on(accounts.read()).get_all();
+    let list = block_on(async move { accounts.read().await.get_all().await });
     let array: dc_array_t = list.into();
 
     Box::into_raw(Box::new(array))
@@ -4527,120 +4352,46 @@ pub unsafe extern "C" fn dc_accounts_maybe_network_lost(accounts: *mut dc_accoun
     block_on(async move { accounts.write().await.maybe_network_lost().await });
 }
 
+pub type dc_accounts_event_emitter_t = deltachat::accounts::EventEmitter;
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_accounts_get_event_emitter(
     accounts: *mut dc_accounts_t,
-) -> *mut dc_event_emitter_t {
+) -> *mut dc_accounts_event_emitter_t {
     if accounts.is_null() {
         eprintln!("ignoring careless call to dc_accounts_get_event_emitter()");
         return ptr::null_mut();
     }
 
     let accounts = &*accounts;
-    let emitter = block_on(accounts.read()).get_event_emitter();
+    let emitter = block_on(async move { accounts.read().await.get_event_emitter().await });
 
     Box::into_raw(Box::new(emitter))
 }
 
-#[cfg(feature = "jsonrpc")]
-mod jsonrpc {
-    use super::*;
-    use deltachat_jsonrpc::api::CommandApi;
-    use deltachat_jsonrpc::events::event_to_json_rpc_notification;
-    use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};
-
-    pub struct dc_jsonrpc_instance_t {
-        receiver: OutReceiver,
-        handle: RpcSession<CommandApi>,
-        event_thread: JoinHandle<Result<(), anyhow::Error>>,
-    }
-
-    #[no_mangle]
-    pub unsafe extern "C" fn dc_jsonrpc_init(
-        account_manager: *mut dc_accounts_t,
-    ) -> *mut dc_jsonrpc_instance_t {
-        if account_manager.is_null() {
-            eprintln!("ignoring careless call to dc_jsonrpc_init()");
-            return ptr::null_mut();
-        }
-
-        let cmd_api =
-            deltachat_jsonrpc::api::CommandApi::from_arc((*account_manager).inner.clone());
-
-        let (request_handle, receiver) = RpcClient::new();
-        let request_handle2 = request_handle.clone();
-        let handle = RpcSession::new(request_handle, cmd_api);
-
-        let events = block_on({
-            async {
-                let am = (*account_manager).inner.clone();
-                let ev = am.read().await.get_event_emitter();
-                drop(am);
-                ev
-            }
-        });
-
-        let event_thread = spawn({
-            async move {
-                while let Some(event) = events.recv().await {
-                    let event = event_to_json_rpc_notification(event);
-                    request_handle2
-                        .send_notification("event", Some(event))
-                        .await?;
-                }
-                let res: Result<(), anyhow::Error> = Ok(());
-                res
-            }
-        });
-
-        let instance = dc_jsonrpc_instance_t {
-            receiver,
-            handle,
-            event_thread,
-        };
-
-        Box::into_raw(Box::new(instance))
-    }
-
-    #[no_mangle]
-    pub unsafe extern "C" fn dc_jsonrpc_unref(jsonrpc_instance: *mut dc_jsonrpc_instance_t) {
-        if jsonrpc_instance.is_null() {
-            eprintln!("ignoring careless call to dc_jsonrpc_unref()");
-            return;
-        }
-        (*jsonrpc_instance).event_thread.abort();
-        drop(Box::from_raw(jsonrpc_instance));
-    }
-
-    #[no_mangle]
-    pub unsafe extern "C" fn dc_jsonrpc_request(
-        jsonrpc_instance: *mut dc_jsonrpc_instance_t,
-        request: *const libc::c_char,
-    ) {
-        if jsonrpc_instance.is_null() || request.is_null() {
-            eprintln!("ignoring careless call to dc_jsonrpc_request()");
-            return;
-        }
-
-        let api = &*jsonrpc_instance;
-        let handle = &api.handle;
-        let request = to_string_lossy(request);
-        spawn(async move {
-            handle.handle_incoming(&request).await;
-        });
-    }
-
-    #[no_mangle]
-    pub unsafe extern "C" fn dc_jsonrpc_next_response(
-        jsonrpc_instance: *mut dc_jsonrpc_instance_t,
-    ) -> *mut libc::c_char {
-        if jsonrpc_instance.is_null() {
-            eprintln!("ignoring careless call to dc_jsonrpc_next_response()");
-            return ptr::null_mut();
-        }
-        let api = &*jsonrpc_instance;
-        block_on(api.receiver.recv())
-            .map(|result| serde_json::to_string(&result).unwrap_or_default().strdup())
-            .unwrap_or(ptr::null_mut())
+#[no_mangle]
+pub unsafe extern "C" fn dc_accounts_event_emitter_unref(
+    emitter: *mut dc_accounts_event_emitter_t,
+) {
+    if emitter.is_null() {
+        eprintln!("ignoring careless call to dc_accounts_event_emitter_unref()");
+        return;
     }
+    let _ = Box::from_raw(emitter);
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn dc_accounts_get_next_event(
+    emitter: *mut dc_accounts_event_emitter_t,
+) -> *mut dc_event_t {
+    if emitter.is_null() {
+        eprintln!("ignoring careless call to dc_accounts_get_next_event()");
+        return ptr::null_mut();
+    }
+    let emitter = &mut *emitter;
+
+    emitter
+        .recv_sync()
+        .map(|ev| Box::into_raw(Box::new(ev)))
+        .unwrap_or_else(ptr::null_mut)
 }

deltachat-ffi/src/lot.rs

@@ -51,14 +51,13 @@ impl Lot {
                 Qr::FprWithoutAddr { fingerprint, .. } => Some(fingerprint),
                 Qr::Account { domain } => Some(domain),
                 Qr::WebrtcInstance { domain, .. } => Some(domain),
-                Qr::Addr { draft, .. } => draft.as_deref(),
+                Qr::Addr { .. } => None,
                 Qr::Url { url } => Some(url),
                 Qr::Text { text } => Some(text),
                 Qr::WithdrawVerifyContact { .. } => None,
                 Qr::WithdrawVerifyGroup { grpname, .. } => Some(grpname),
                 Qr::ReviveVerifyContact { .. } => None,
                 Qr::ReviveVerifyGroup { grpname, .. } => Some(grpname),
-                Qr::Login { address, .. } => Some(address),
             },
             Self::Error(err) => Some(err),
         }
@@ -80,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,
         }
     }
@@ -109,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,
         }
@@ -126,14 +118,13 @@ impl Lot {
                 Qr::FprWithoutAddr { .. } => Default::default(),
                 Qr::Account { .. } => Default::default(),
                 Qr::WebrtcInstance { .. } => 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(),
         }
@@ -198,9 +189,6 @@ pub enum LotState {
     /// text1=groupname
     QrReviveVerifyGroup = 512,
 
-    /// text1=email_address
-    QrLogin = 520,
-
     // Message States
     MsgInFresh = 10,
     MsgInNoticed = 13,

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 {

deltachat-jsonrpc/.gitignore

@@ -1,3 +0,0 @@
-accounts/
-
-.cargo

deltachat-jsonrpc/Cargo.toml

@@ -1,41 +0,0 @@
-[package]
-name = "deltachat-jsonrpc"
-version = "1.104.0"
-description = "DeltaChat JSON-RPC API"
-authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
-edition = "2021"
-default-run = "deltachat-jsonrpc-server"
-license = "MPL-2.0"
-
-[[bin]]
-name = "deltachat-jsonrpc-server"
-path = "src/webserver.rs"
-required-features = ["webserver"]
-
-[dependencies]
-anyhow = "1"
-deltachat = { path = ".." }
-num-traits = "0.2"
-serde = { version = "1.0", features = ["derive"] }
-tempfile = "3.3.0"
-log = "0.4"
-async-channel = { version = "1.8.0" }
-futures = { version = "0.3.25" }
-serde_json = "1.0.89"
-yerpc = { version = "^0.3.1", features = ["anyhow_expose"] }
-typescript-type-def = { version = "0.5.5", features = ["json_value"] }
-tokio = { version = "1.22.0" }
-sanitize-filename = "0.4"
-walkdir = "2.3.2"
-
-# optional dependencies
-axum = { version = "0.6.1", optional = true, features = ["ws"] }
-env_logger = { version = "0.10.0", optional = true }
-
-[dev-dependencies]
-tokio = { version = "1.22.0", features = ["full", "rt-multi-thread"] }
-
-
-[features]
-default = []
-webserver = ["env_logger", "axum", "tokio/full", "yerpc/support-axum"]

deltachat-jsonrpc/README.md

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

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

deltachat-jsonrpc/src/api/events.rs

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

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

@@ -1,45 +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)]
-#[serde(tag = "type")]
-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,
-    },
-    #[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(),
-            );
-            Ok(Account::Configured {
-                id,
-                display_name,
-                addr,
-                profile_image,
-                color,
-            })
-        } else {
-            Ok(Account::Unconfigured { id })
-        }
-    }
-}

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

@@ -1,213 +0,0 @@
-use std::time::{Duration, SystemTime};
-
-use anyhow::{anyhow, bail, Result};
-use deltachat::chat::{self, get_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)]
-#[serde(rename_all = "camelCase")]
-pub struct FullChat {
-    id: u32,
-    name: String,
-    is_protected: bool,
-    profile_image: Option<String>, //BLOBS ?
-    archived: 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>,
-    color: String,
-    fresh_message_counter: usize,
-    // is_group - please check over chat.type in frontend instead
-    is_contact_request: 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 mut contacts = Vec::with_capacity(contact_ids.len());
-
-        for contact_id in &contact_ids {
-            contacts.push(
-                ContactObject::try_from_dc_contact(
-                    context,
-                    Contact::load_from_db(context, *contact_id).await?,
-                )
-                .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.get(0) {
-                Some(contact) => Contact::load_from_db(context, *contact)
-                    .await?
-                    .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,
-            chat_type: chat
-                .get_type()
-                .to_u32()
-                .ok_or_else(|| anyhow!("unknown chat type id"))?, // TODO get rid of this unwrap?
-            is_unpromoted: chat.is_unpromoted(),
-            is_self_talk: chat.is_self_talk(),
-            contacts,
-            contact_ids: contact_ids.iter().map(|id| id.to_u32()).collect(),
-            color,
-            fresh_message_counter,
-            is_contact_request: chat.is_contact_request(),
-            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)]
-#[serde(rename_all = "camelCase")]
-pub struct BasicChat {
-    id: u32,
-    name: String,
-    is_protected: bool,
-    profile_image: Option<String>, //BLOBS ?
-    archived: bool,
-    chat_type: u32,
-    is_unpromoted: bool,
-    is_self_talk: bool,
-    color: String,
-    is_contact_request: 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,
-            chat_type: chat
-                .get_type()
-                .to_u32()
-                .ok_or_else(|| anyhow!("unknown chat type id"))?, // TODO get rid of this unwrap?
-            is_unpromoted: chat.is_unpromoted(),
-            is_self_talk: chat.is_self_talk(),
-            color,
-            is_contact_request: chat.is_contact_request(),
-            is_device_chat: chat.is_device_talk(),
-            is_muted: chat.is_muted(),
-        })
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, TypeDef)]
-pub enum MuteDuration {
-    NotMuted,
-    Forever,
-    Until(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(n) => {
-                if n <= 0 {
-                    bail!("failed to read mute duration")
-                }
-
-                Ok(SystemTime::now()
-                    .checked_add(Duration::from_secs(n as u64))
-                    .map_or(chat::MuteDuration::Forever, chat::MuteDuration::Until))
-            }
-        }
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, TypeDef)]
-#[serde(rename = "ChatVisibility")]
-pub enum JSONRPCChatVisibility {
-    Normal,
-    Archived,
-    Pinned,
-}
-
-impl JSONRPCChatVisibility {
-    pub fn into_core_type(self) -> ChatVisibility {
-        match self {
-            JSONRPCChatVisibility::Normal => ChatVisibility::Normal,
-            JSONRPCChatVisibility::Archived => ChatVisibility::Archived,
-            JSONRPCChatVisibility::Pinned => ChatVisibility::Pinned,
-        }
-    }
-}

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

@@ -1,141 +0,0 @@
-use anyhow::Result;
-use deltachat::constants::*;
-use deltachat::contact::{Contact, ContactId};
-use deltachat::{
-    chat::{get_chat_contacts, ChatVisibility},
-    chatlist::Chatlist,
-};
-use deltachat::{
-    chat::{Chat, ChatId},
-    message::MsgId,
-};
-use num_traits::cast::ToPrimitive;
-use serde::{Deserialize, Serialize};
-use typescript_type_def::TypeDef;
-
-use super::color_int_to_hex_string;
-
-#[derive(Deserialize, Serialize, TypeDef)]
-pub struct ChatListEntry(pub u32, pub u32);
-
-#[derive(Serialize, TypeDef)]
-#[serde(tag = "type")]
-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,
-        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,
-    },
-    ArchiveLink,
-    #[serde(rename_all = "camelCase")]
-    Error {
-        id: u32,
-        error: String,
-    },
-}
-
-pub(crate) async fn get_chat_list_item_by_id(
-    ctx: &deltachat::context::Context,
-    entry: &ChatListEntry,
-) -> Result<ChatListItemFetchResult> {
-    let chat_id = ChatId::new(entry.0);
-    let last_msgid = match entry.1 {
-        0 => None,
-        _ => Some(MsgId::new(entry.1)),
-    };
-
-    if chat_id.is_archived_link() {
-        return Ok(ChatListItemFetchResult::ArchiveLink);
-    }
-
-    let chat = Chat::load_from_db(ctx, chat_id).await?;
-    let summary = Chatlist::get_summary2(ctx, chat_id, last_msgid, Some(&chat)).await?;
-
-    let summary_text1 = summary.prefix.map_or_else(String::new, |s| s.to_string());
-    let summary_text2 = summary.text.to_owned();
-
-    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 = match last_msgid {
-        Some(id) => {
-            let last_message = deltachat::message::Message::load_from_db(ctx, id).await?;
-            Some(last_message.get_timestamp() * 1000)
-        }
-        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.get(0);
-        let was_seen_recently = match contact {
-            Some(contact) => Contact::load_from_db(ctx, *contact)
-                .await?
-                .was_seen_recently(),
-            None => false,
-        };
-        (
-            contact.map(|contact_id| contact_id.to_u32()),
-            was_seen_recently,
-        )
-    } else {
-        (None, false)
-    };
-
-    let fresh_message_counter = chat_id.get_fresh_msg_cnt(ctx).await?;
-    let color = color_int_to_hex_string(chat.get_color(ctx).await?);
-
-    Ok(ChatListItemFetchResult::ChatListItem {
-        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
-        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,
-    })
-}

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

@@ -1,55 +0,0 @@
-use anyhow::Result;
-use deltachat::contact::VerifiedStatus;
-use deltachat::context::Context;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-use super::color_int_to_hex_string;
-
-#[derive(Serialize, TypeDef)]
-#[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,
-    is_verified: bool,
-    /// the contact's last seen timestamp
-    last_seen: i64,
-    was_seen_recently: 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? == VerifiedStatus::BidirectVerified;
-
-        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(),
-            is_verified,
-            last_seen: contact.last_seen(),
-            was_seen_recently: contact.was_seen_recently(),
-        })
-    }
-}

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

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

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

@@ -1,492 +0,0 @@
-use anyhow::{anyhow, Result};
-use deltachat::chat::Chat;
-use deltachat::chat::ChatItem;
-use deltachat::constants::Chattype;
-use deltachat::contact::Contact;
-use deltachat::context::Context;
-use deltachat::download;
-use deltachat::message::Message;
-use deltachat::message::MsgId;
-use deltachat::message::Viewtype;
-use deltachat::reaction::get_msg_reactions;
-use num_traits::cast::ToPrimitive;
-use serde::Deserialize;
-use serde::Serialize;
-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)]
-#[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: Option<String>,
-    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,
-    /// 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>,
-
-    download_state: DownloadState,
-
-    reactions: Option<JSONRPCReactions>,
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(tag = "kind")]
-enum MessageQuote {
-    JustText {
-        text: String,
-    },
-    #[serde(rename_all = "camelCase")]
-    WithMessage {
-        text: String,
-        message_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_message_id(context: &Context, message_id: u32) -> Result<Self> {
-        let msg_id = MsgId::new(message_id);
-        Self::from_msg_id(context, msg_id).await
-    }
-
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
-        let message = Message::load_from_db(context, msg_id).await?;
-
-        let sender_contact = Contact::load_from_db(context, message.get_from_id()).await?;
-        let sender = ContactObject::try_from_dc_contact(context, sender_contact).await?;
-        let file_bytes = message.get_filebytes(context).await;
-        let 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::load_from_db(context, quote.get_from_id()).await?;
-                    Some(MessageQuote::WithMessage {
-                        text: quoted_text,
-                        message_id: quote.get_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?;
-        let reactions = if reactions.is_empty() {
-            None
-        } else {
-            Some(reactions.into())
-        };
-
-        Ok(MessageObject {
-            id: msg_id.to_u32(),
-            chat_id: message.get_chat_id().to_u32(),
-            from_id: message.get_from_id().to_u32(),
-            quote,
-            parent_id,
-            text: message.get_text(),
-            has_location: message.has_location(),
-            has_html: message.has_html(),
-            view_type: message.get_viewtype().into(),
-            state: message
-                .get_state()
-                .to_u32()
-                .ok_or_else(|| anyhow!("state conversion to number failed"))?,
-            error: message.error(),
-
-            timestamp: message.get_timestamp(),
-            sort_timestamp: message.get_sort_timestamp(),
-            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(),
-            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()
-                        .ok_or_else(|| anyhow!("state 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,
-
-            download_state,
-
-            reactions,
-        })
-    }
-}
-
-#[derive(Serialize, Deserialize, TypeDef)]
-#[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.
-    /// 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,
-}
-
-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,
-        }
-    }
-}
-
-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,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-pub enum DownloadState {
-    Done,
-    Available,
-    Failure,
-    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::InProgress => DownloadState::InProgress,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-pub enum SystemMessageType {
-    Unknown,
-    GroupNameChanged,
-    GroupImageChanged,
-    MemberAddedToGroup,
-    MemberRemovedFromGroup,
-    AutocryptSetupMessage,
-    SecurejoinMessage,
-    LocationStreamingEnabled,
-    LocationOnly,
-
-    /// Chat ephemeral message timer is changed.
-    EphemeralTimerChanged,
-
-    // Chat protection state changed
-    ChatProtectionEnabled,
-    ChatProtectionDisabled,
-
-    /// Self-sent-message that contains only json used for multi-device-sync;
-    /// if possible, we attach that to other messages as for locations.
-    MultiDeviceSync,
-
-    // Sync message that contains a json payload
-    // sent to the other webxdc instances
-    // These messages are not shown in the chat.
-    WebxdcStatusUpdate,
-
-    /// Webxdc info added with `info` set in `send_webxdc_status_update()`.
-    WebxdcInfoMessage,
-}
-
-impl From<deltachat::mimeparser::SystemMessage> for SystemMessageType {
-    fn from(system_message_type: deltachat::mimeparser::SystemMessage) -> Self {
-        use deltachat::mimeparser::SystemMessage;
-        match system_message_type {
-            SystemMessage::Unknown => SystemMessageType::Unknown,
-            SystemMessage::GroupNameChanged => SystemMessageType::GroupNameChanged,
-            SystemMessage::GroupImageChanged => SystemMessageType::GroupImageChanged,
-            SystemMessage::MemberAddedToGroup => SystemMessageType::MemberAddedToGroup,
-            SystemMessage::MemberRemovedFromGroup => SystemMessageType::MemberRemovedFromGroup,
-            SystemMessage::AutocryptSetupMessage => SystemMessageType::AutocryptSetupMessage,
-            SystemMessage::SecurejoinMessage => SystemMessageType::SecurejoinMessage,
-            SystemMessage::LocationStreamingEnabled => SystemMessageType::LocationStreamingEnabled,
-            SystemMessage::LocationOnly => SystemMessageType::LocationOnly,
-            SystemMessage::EphemeralTimerChanged => SystemMessageType::EphemeralTimerChanged,
-            SystemMessage::ChatProtectionEnabled => SystemMessageType::ChatProtectionEnabled,
-            SystemMessage::ChatProtectionDisabled => SystemMessageType::ChatProtectionDisabled,
-            SystemMessage::MultiDeviceSync => SystemMessageType::MultiDeviceSync,
-            SystemMessage::WebxdcStatusUpdate => SystemMessageType::WebxdcStatusUpdate,
-            SystemMessage::WebxdcInfoMessage => SystemMessageType::WebxdcInfoMessage,
-        }
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageNotificationInfo {
-    id: u32,
-    chat_id: u32,
-    account_id: u32,
-
-    image: Option<String>,
-    image_mime_type: Option<String>,
-
-    chat_name: String,
-    chat_profile_image: Option<String>,
-
-    /// also known as summary_text1
-    summary_prefix: Option<String>,
-    /// also known as summary_text2
-    summary_text: String,
-}
-
-impl MessageNotificationInfo {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
-        let message = Message::load_from_db(context, msg_id).await?;
-        let chat = Chat::load_from_db(context, message.get_chat_id()).await?;
-
-        let image = if matches!(
-            message.get_viewtype(),
-            Viewtype::Image | Viewtype::Gif | Viewtype::Sticker
-        ) {
-            message
-                .get_file(context)
-                .map(|path_buf| path_buf.to_str().map(|s| s.to_owned()))
-                .unwrap_or_default()
-        } else {
-            None
-        };
-
-        let chat_profile_image = chat
-            .get_profile_image(context)
-            .await?
-            .map(|path_buf| path_buf.to_str().map(|s| s.to_owned()))
-            .unwrap_or_default();
-
-        let summary = message.get_summary(context, Some(&chat)).await?;
-
-        Ok(MessageNotificationInfo {
-            id: msg_id.to_u32(),
-            chat_id: message.get_chat_id().to_u32(),
-            account_id: context.get_id(),
-            image,
-            image_mime_type: message.get_filemime(),
-            chat_name: chat.name,
-            chat_profile_image,
-            summary_prefix: summary.prefix.map(|s| s.to_string()),
-            summary_text: summary.text,
-        })
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct MessageSearchResult {
-    id: u32,
-    author_profile_image: Option<String>,
-    author_name: String,
-    author_color: String,
-    chat_name: Option<String>,
-    message: String,
-    timestamp: i64,
-}
-
-impl MessageSearchResult {
-    pub async fn from_msg_id(context: &Context, msg_id: MsgId) -> Result<Self> {
-        let message = Message::load_from_db(context, msg_id).await?;
-        let chat = Chat::load_from_db(context, message.get_chat_id()).await?;
-        let sender = Contact::load_from_db(context, message.get_from_id()).await?;
-
-        let profile_image = match sender.get_profile_image(context).await? {
-            Some(path_buf) => path_buf.to_str().map(|s| s.to_owned()),
-            None => None,
-        };
-
-        Ok(Self {
-            id: msg_id.to_u32(),
-            author_profile_image: profile_image,
-            author_name: sender.get_display_name().to_owned(),
-            author_color: color_int_to_hex_string(sender.get_color()),
-            chat_name: if chat.get_type() == Chattype::Single {
-                Some(chat.get_name().to_owned())
-            } else {
-                None
-            },
-            message: message.get_text().unwrap_or_default(),
-            timestamp: message.get_timestamp(),
-        })
-    }
-}
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase", rename = "MessageListItem", tag = "kind")]
-pub enum JSONRPCMessageListItem {
-    Message {
-        msg_id: u32,
-    },
-
-    /// Day marker, separating messages that correspond to different
-    /// days according to local time.
-    DayMarker {
-        /// Marker timestamp, for day markers, in unix milliseconds
-        timestamp: i64,
-    },
-}
-
-impl From<ChatItem> for JSONRPCMessageListItem {
-    fn from(item: ChatItem) -> Self {
-        match item {
-            ChatItem::Message { msg_id } => JSONRPCMessageListItem::Message {
-                msg_id: msg_id.to_u32(),
-            },
-            ChatItem::DayMarker { timestamp } => JSONRPCMessageListItem::DayMarker { timestamp },
-        }
-    }
-}

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

@@ -1,22 +0,0 @@
-pub mod account;
-pub mod chat;
-pub mod chat_list;
-pub mod contact;
-pub mod location;
-pub mod message;
-pub mod provider_info;
-pub mod qr;
-pub mod reactions;
-pub mod webxdc;
-
-pub fn color_int_to_hex_string(color: u32) -> String {
-    format!("{:#08x}", color).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,22 +0,0 @@
-use deltachat::provider::Provider;
-use num_traits::cast::ToPrimitive;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename_all = "camelCase")]
-pub struct ProviderInfo {
-    pub before_login_hint: String,
-    pub overview_page: String,
-    pub status: u32, // in reality this is an enum, but for simlicity 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 {
-            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,213 +0,0 @@
-use deltachat::qr::Qr;
-use serde::Serialize;
-use typescript_type_def::TypeDef;
-
-#[derive(Serialize, TypeDef)]
-#[serde(rename = "Qr", rename_all = "camelCase")]
-#[serde(tag = "type")]
-pub enum QrObject {
-    AskVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    AskVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    FprOk {
-        contact_id: u32,
-    },
-    FprMismatch {
-        contact_id: Option<u32>,
-    },
-    FprWithoutAddr {
-        fingerprint: String,
-    },
-    Account {
-        domain: String,
-    },
-    WebrtcInstance {
-        domain: String,
-        instance_pattern: String,
-    },
-    Addr {
-        contact_id: u32,
-        draft: Option<String>,
-    },
-    Url {
-        url: String,
-    },
-    Text {
-        text: String,
-    },
-    WithdrawVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    WithdrawVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    ReviveVerifyContact {
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    ReviveVerifyGroup {
-        grpname: String,
-        grpid: String,
-        contact_id: u32,
-        fingerprint: String,
-        invitenumber: String,
-        authcode: String,
-    },
-    Login {
-        address: String,
-    },
-}
-
-impl From<Qr> for QrObject {
-    fn from(qr: Qr) -> Self {
-        match qr {
-            Qr::AskVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::AskVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::AskVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::FprOk { contact_id } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::FprOk { contact_id }
-            }
-            Qr::FprMismatch { contact_id } => {
-                let contact_id = contact_id.map(|contact_id| contact_id.to_u32());
-                QrObject::FprMismatch { contact_id }
-            }
-            Qr::FprWithoutAddr { fingerprint } => QrObject::FprWithoutAddr { fingerprint },
-            Qr::Account { domain } => QrObject::Account { domain },
-            Qr::WebrtcInstance {
-                domain,
-                instance_pattern,
-            } => QrObject::WebrtcInstance {
-                domain,
-                instance_pattern,
-            },
-            Qr::Addr { contact_id, draft } => {
-                let contact_id = contact_id.to_u32();
-                QrObject::Addr { contact_id, draft }
-            }
-            Qr::Url { url } => QrObject::Url { url },
-            Qr::Text { text } => QrObject::Text { text },
-            Qr::WithdrawVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::WithdrawVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::WithdrawVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyContact {
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyContact {
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::ReviveVerifyGroup {
-                grpname,
-                grpid,
-                contact_id,
-                fingerprint,
-                invitenumber,
-                authcode,
-            } => {
-                let contact_id = contact_id.to_u32();
-                let fingerprint = fingerprint.to_string();
-                QrObject::ReviveVerifyGroup {
-                    grpname,
-                    grpid,
-                    contact_id,
-                    fingerprint,
-                    invitenumber,
-                    authcode,
-                }
-            }
-            Qr::Login { address, .. } => QrObject::Login { address },
-        }
-    }
-}

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

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

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

@@ -1,64 +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)]
-#[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,
-}
-
-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,
-            internet_access,
-        } = 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,
-        })
-    }
-}

deltachat-jsonrpc/src/lib.rs

@@ -1,92 +0,0 @@
-pub mod api;
-pub use api::events;
-pub use yerpc;
-
-#[cfg(test)]
-mod tests {
-    use super::api::{Accounts, CommandApi};
-    use async_channel::unbounded;
-    use futures::StreamExt;
-    use tempfile::TempDir;
-    use yerpc::{RpcClient, RpcSession};
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn basic_json_rpc_functionality() -> anyhow::Result<()> {
-        let tmp_dir = TempDir::new().unwrap().path().into();
-        let accounts = Accounts::new(tmp_dir).await?;
-        let api = CommandApi::new(accounts);
-
-        let (sender, mut 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.next().await;
-            println!("{:?}", result);
-            assert_eq!(result, Some(response.to_owned()));
-        }
-        {
-            let request = r#"{"jsonrpc":"2.0","method":"get_all_account_ids","params":[],"id":2}"#;
-            let response = r#"{"jsonrpc":"2.0","id":2,"result":[1]}"#;
-            session.handle_incoming(request).await;
-            let result = receiver.next().await;
-            println!("{:?}", result);
-            assert_eq!(result, Some(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 accounts = Accounts::new(tmp_dir).await?;
-        let api = CommandApi::new(accounts);
-
-        let (sender, mut 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.next().await;
-            assert_eq!(result, Some(response.to_owned()));
-        }
-        {
-            let request = r#"{"jsonrpc":"2.0","method":"batch_set_config","id":2,"params":[1,{"addr":"","mail_user":"","mail_pw":"","mail_server":"","mail_port":"","mail_security":"","imap_certificate_checks":"","send_user":"","send_pw":"","send_server":"","send_port":"","send_security":"","smtp_certificate_checks":"","socks5_enabled":"0","socks5_host":"","socks5_port":"","socks5_user":"","socks5_password":""}]}"#;
-            let response = r#"{"jsonrpc":"2.0","id":2,"result":null}"#;
-            session.handle_incoming(request).await;
-            let result = receiver.next().await;
-            assert_eq!(result, Some(response.to_owned()));
-        }
-
-        Ok(())
-    }
-}

deltachat-jsonrpc/src/webserver.rs

@@ -1,54 +0,0 @@
-use axum::{extract::ws::WebSocketUpgrade, response::Response, routing::get, Extension, Router};
-use std::net::SocketAddr;
-use std::path::PathBuf;
-use yerpc::axum::handle_ws_rpc;
-use yerpc::{RpcClient, RpcSession};
-
-mod api;
-use api::events::event_to_json_rpc_notification;
-use api::{Accounts, CommandApi};
-
-const DEFAULT_PORT: u16 = 20808;
-
-#[tokio::main(flavor = "multi_thread")]
-async fn main() -> Result<(), std::io::Error> {
-    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
-
-    let path = std::env::var("DC_ACCOUNTS_PATH").unwrap_or_else(|_| "./accounts".to_string());
-    let port = std::env::var("DC_PORT")
-        .map(|port| port.parse::<u16>().expect("DC_PORT must be a number"))
-        .unwrap_or(DEFAULT_PORT);
-    log::info!("Starting with accounts directory `{path}`.");
-    let accounts = Accounts::new(PathBuf::from(&path)).await.unwrap();
-    let state = CommandApi::new(accounts);
-
-    let app = Router::new()
-        .route("/ws", get(handler))
-        .layer(Extension(state.clone()));
-
-    tokio::spawn(async move {
-        state.accounts.read().await.start_io().await;
-    });
-
-    let addr = SocketAddr::from(([127, 0, 0, 1], port));
-    log::info!("JSON-RPC WebSocket server listening on {}", addr);
-    axum::Server::bind(&addr)
-        .serve(app.into_make_service())
-        .await
-        .unwrap();
-
-    Ok(())
-}
-
-async fn handler(ws: WebSocketUpgrade, Extension(api): Extension<CommandApi>) -> Response {
-    let (client, out_receiver) = RpcClient::new();
-    let session = RpcSession::new(client.clone(), api.clone());
-    tokio::spawn(async move {
-        let events = api.accounts.read().await.get_event_emitter();
-        while let Some(event) = events.recv().await {
-            let event = event_to_json_rpc_notification(event);
-            client.send_notification("event", Some(event)).await.ok();
-        }
-    });
-    handle_ws_rpc(ws, out_receiver, session).await
-}

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,6 +0,0 @@
-node_modules
-accounts
-docs
-coverage
-yarn*
-package-lock.json

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/example.html

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

deltachat-jsonrpc/typescript/example/example.ts

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

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

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

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

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

deltachat-jsonrpc/typescript/package.json

@@ -1,52 +0,0 @@
-{
-  "author": "Delta Chat Developers (ML) <delta@codespeak.net>",
-  "dependencies": {
-    "@deltachat/tiny-emitter": "3.0.0",
-    "isomorphic-ws": "^4.0.1",
-    "yerpc": "^0.3.3"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.2.21",
-    "@types/chai-as-promised": "^7.1.5",
-    "@types/mocha": "^9.0.0",
-    "@types/node-fetch": "^2.5.7",
-    "@types/ws": "^7.2.4",
-    "c8": "^7.10.0",
-    "chai": "^4.3.4",
-    "chai-as-promised": "^7.1.1",
-    "esbuild": "^0.14.11",
-    "http-server": "^14.1.1",
-    "mocha": "^9.1.1",
-    "node-fetch": "^2.6.1",
-    "npm-run-all": "^4.1.5",
-    "prettier": "^2.6.2",
-    "typedoc": "^0.23.2",
-    "typescript": "^4.5.5",
-    "ws": "^8.5.0"
-  },
-  "license": "MPL-2.0",
-  "main": "dist/deltachat.js",
-  "name": "@deltachat/jsonrpc-client",
-  "scripts": {
-    "build": "run-s generate-bindings extract-constants build:tsc build:bundle",
-    "build:bundle": "esbuild --format=esm --bundle dist/deltachat.js --outfile=dist/deltachat.bundle.js",
-    "build:tsc": "tsc",
-    "docs": "typedoc --out docs deltachat.ts",
-    "example": "run-s build example:build example:start",
-    "example:build": "esbuild --bundle dist/example/example.js --outfile=dist/example.bundle.js",
-    "example:dev": "esbuild example/example.ts --bundle --outfile=dist/example.bundle.js --servedir=.",
-    "example:start": "http-server .",
-    "extract-constants": "node ./scripts/generate-constants.js",
-    "generate-bindings": "cargo test",
-    "prettier:check": "prettier --check **.ts",
-    "prettier:fix": "prettier --write **.ts",
-    "test": "run-s test:prepare test:run-coverage test:report-coverage",
-    "test:prepare": "cargo build --package deltachat-rpc-server --bin deltachat-rpc-server",
-    "test: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.104.0"
-}

deltachat-jsonrpc/typescript/report_api_coverage.mjs

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

deltachat-jsonrpc/typescript/src/lib.ts

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

deltachat-jsonrpc/typescript/test/basic.ts

@@ -1,152 +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)
-    // 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 managment", () => {
-    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 managment", function () {
-    let accountId: number;
-    before(async () => {
-      accountId = await dc.rpc.addAccount();
-    });
-    it("should block and unblock contact", async function () {
-      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 retrive", 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 retrive 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 retrive (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 retrive 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 retrive 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,198 +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(12000);
-    if (!process.env.DCC_NEW_TMP_EMAIL) {
-      if (process.env.COVERAGE && !process.env.COVERAGE_OFFLINE) {
-        console.error(
-          "CAN NOT RUN COVERAGE correctly: Missing DCC_NEW_TMP_EMAIL environment variable!\n\n",
-          "You can set COVERAGE_OFFLINE=1 to circumvent this check and skip the online tests, but those coverage results will be wrong, because some functions can only be tested in the online test"
-        );
-        process.exit(1);
-      }
-      console.log(
-        "Missing DCC_NEW_TMP_EMAIL environment variable!, skip intergration tests"
-      );
-      this.skip();
-    }
-    serverHandle = await startServer();
-    dc = new DeltaChat(serverHandle.stdin, serverHandle.stdout);
-
-    dc.on("ALL", (contextId, { type }) => {
-      if (type !== "Info") console.log(contextId, type);
-    });
-
-    account1 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
-    if (!account1 || !account1.email || !account1.password) {
-      console.log(
-        "We didn't got back an account from the api, skip intergration tests"
-      );
-      this.skip();
-    }
-
-    account2 = await createTempUser(process.env.DCC_NEW_TMP_EMAIL);
-    if (!account2 || !account2.email || !account2.password) {
-      console.log(
-        "We didn't got back an account2 from the api, skip intergration 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 recieve 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 = Promise.race([
-      waitForEvent(dc, "MsgsChanged", accountId2),
-      waitForEvent(dc, "IncomingMsg", accountId2),
-    ]);
-
-    await dc.rpc.miscSendTextMessage(accountId1, chatId, "Hello");
-    const { chatId: chatIdOnAccountB } = await eventPromise;
-    await dc.rpc.acceptChat(accountId2, chatIdOnAccountB);
-    const messageList = await dc.rpc.getMessageIds(
-      accountId2,
-      chatIdOnAccountB,
-      0
-    );
-
-    expect(messageList).have.length(1);
-    const message = await dc.rpc.getMessage(accountId2, messageList[0]);
-    expect(message.text).equal("Hello");
-  });
-
-  it("send and recieve 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 = Promise.race([
-      waitForEvent(dc, "MsgsChanged", accountId2),
-      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,
-      0
-    );
-    const message = await dc.rpc.getMessage(
-      accountId2,
-      messageList.reverse()[0]
-    );
-    expect(message.text).equal("Hello2");
-    // Send message back from B to A
-    const eventPromise2 = Promise.race([
-      waitForEvent(dc, "MsgsChanged", accountId1),
-      waitForEvent(dc, "IncomingMsg", accountId1),
-    ]);
-    dc.rpc.miscSendTextMessage(accountId2, chatId, "super secret message");
-    // Check if answer arives at A and if it is encrypted
-    await eventPromise2;
-
-    const messageId = (
-      await dc.rpc.getMessageIds(accountId1, chatId, 0)
-    ).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["type"]>(
-  dc: DeltaChat,
-  eventType: T,
-  accountId: number,
-  timeout: number = EVENT_TIMEOUT
-): Promise<Extract<DcEvent, { type: 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,92 +0,0 @@
-import { tmpdir } from "os";
-import { join, resolve } from "path";
-import { mkdtemp, rm } from "fs/promises";
-import { spawn, exec } from "child_process";
-import fetch from "node-fetch";
-import { Readable, Writable } from "node:stream";
-
-export type RpcServerHandle = {
-  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 async function createTempUser(url: string) {
-  const response = await fetch(url, {
-    method: "POST", 
-    headers: {
-      "cache-control": "no-cache",
-    },
-  });
-  if (!response.ok) throw new Error('Received invalid response')
-  return response.json(); 
-}
-
-function getTargetDir(): Promise<string> {
-  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", "example/*.ts", "test/*.ts"],
-  "compileOnSave": false
-}

deltachat-rpc-client/README.md

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

deltachat-rpc-client/examples/echobot.py

@@ -1,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.
-"""
-import asyncio
-
-from deltachat_rpc_client import events, run_bot_cli
-
-hooks = events.HookCollection()
-
-
-@hooks.on(events.RawEvent)
-async def log_event(event):
-    print(event)
-
-
-@hooks.on(events.NewMessage)
-async def echo(msg):
-    await msg.chat.send_text(msg.text)
-
-
-if __name__ == "__main__":
-    asyncio.run(run_bot_cli(hooks))

deltachat-rpc-client/examples/echobot_advanced.py

@@ -1,55 +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 asyncio
-import logging
-import sys
-
-from deltachat_rpc_client import Bot, DeltaChat, EventType, Rpc, events
-
-hooks = events.HookCollection()
-
-
-@hooks.on(events.RawEvent)
-async def log_event(event):
-    if event.type == EventType.INFO:
-        logging.info(event.msg)
-    elif event.type == EventType.WARNING:
-        logging.warning(event.msg)
-
-
-@hooks.on(events.RawEvent(EventType.ERROR))
-async def log_error(event):
-    logging.error(event.msg)
-
-
-@hooks.on(events.NewMessage(r".+", func=lambda msg: not msg.text.startswith("/")))
-async def echo(msg):
-    await msg.chat.send_text(msg.text)
-
-
-@hooks.on(events.NewMessage(r"/help"))
-async def help_command(msg):
-    await msg.chat.send_text("Send me any text message and I will echo it back")
-
-
-async def main():
-    async with Rpc() as rpc:
-        deltachat = DeltaChat(rpc)
-        system_info = await deltachat.get_system_info()
-        logging.info("Running deltachat core %s", system_info.deltachat_core_version)
-
-        accounts = await deltachat.get_all_accounts()
-        account = accounts[0] if accounts else await deltachat.add_account()
-
-        bot = Bot(account, hooks)
-        if not await bot.is_configured():
-            asyncio.create_task(bot.configure(email=sys.argv[1], password=sys.argv[2]))
-        await bot.run_forever()
-
-
-if __name__ == "__main__":
-    logging.basicConfig(level=logging.INFO)
-    asyncio.run(main())

deltachat-rpc-client/examples/echobot_no_hooks.py

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

deltachat-rpc-client/pyproject.toml

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

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

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

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

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

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

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

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

@@ -1,100 +0,0 @@
-"""Event loop implementations offering high level event handling/hooking."""
-import logging
-from typing import Callable, Dict, Iterable, Optional, Set, Tuple, Type, Union
-
-from deltachat_rpc_client.account import Account
-
-from .const import EventType
-from .events import EventFilter, NewInfoMessage, NewMessage, RawEvent
-from .utils import AttrDict
-
-
-class Client:
-    """Simple Delta Chat client that listen to events of a single account."""
-
-    def __init__(
-        self,
-        account: Account,
-        hooks: Optional[Iterable[Tuple[Callable, Union[type, EventFilter]]]] = None,
-        logger: Optional[logging.Logger] = None,
-    ) -> None:
-        self.account = account
-        self.logger = logger or logging
-        self._hooks: Dict[type, Set[tuple]] = {}
-        self.add_hooks(hooks or [])
-
-    def add_hooks(
-        self, hooks: Iterable[Tuple[Callable, Union[type, EventFilter]]]
-    ) -> None:
-        for hook, event in hooks:
-            self.add_hook(hook, event)
-
-    def add_hook(
-        self, hook: Callable, event: Union[type, EventFilter] = RawEvent
-    ) -> None:
-        """Register hook for the given event filter."""
-        if isinstance(event, type):
-            event = event()
-        assert isinstance(event, EventFilter)
-        self._hooks.setdefault(type(event), set()).add((hook, event))
-
-    def remove_hook(self, hook: Callable, event: Union[type, EventFilter]) -> None:
-        """Unregister hook from the given event filter."""
-        if isinstance(event, type):
-            event = event()
-        self._hooks.get(type(event), set()).remove((hook, event))
-
-    async def is_configured(self) -> bool:
-        return await self.account.is_configured()
-
-    async def configure(self, email: str, password: str, **kwargs) -> None:
-        await self.account.set_config("addr", email)
-        await self.account.set_config("mail_pw", password)
-        for key, value in kwargs.items():
-            await self.account.set_config(key, value)
-        await self.account.configure()
-        self.logger.debug("Account configured")
-
-    async def run_forever(self) -> None:
-        self.logger.debug("Listening to incoming events...")
-        if await self.is_configured():
-            await self.account.start_io()
-        await self._process_messages()  # Process old messages.
-        while True:
-            event = await self.account.wait_for_event()
-            event["type"] = EventType(event.type)
-            event["account"] = self.account
-            await self._on_event(event)
-            if event.type == EventType.INCOMING_MSG:
-                await self._process_messages()
-
-    async def _on_event(
-        self, event: AttrDict, filter_type: Type[EventFilter] = RawEvent
-    ) -> None:
-        for hook, evfilter in self._hooks.get(filter_type, []):
-            if await evfilter.filter(event):
-                try:
-                    await hook(event)
-                except Exception as ex:
-                    self.logger.exception(ex)
-
-    def _should_process_messages(self) -> bool:
-        return any(issubclass(filter_type, NewMessage) for filter_type in self._hooks)
-
-    async def _process_messages(self) -> None:
-        if self._should_process_messages():
-            for message in await self.account.get_fresh_messages_in_arrival_order():
-                snapshot = await message.get_snapshot()
-                if snapshot.is_info:
-                    await self._on_event(snapshot, NewInfoMessage)
-                else:
-                    await self._on_event(snapshot, NewMessage)
-                await snapshot.message.mark_seen()
-
-
-class Bot(Client):
-    """Simple bot implementation that listent to events of a single account."""
-
-    async def configure(self, email: str, password: str, **kwargs) -> None:
-        kwargs.setdefault("bot", "1")
-        await super().configure(email, password, **kwargs)

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

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

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

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

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

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

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

@@ -1,161 +0,0 @@
-"""High-level classes for event processing and filtering."""
-import inspect
-import re
-from abc import ABC, abstractmethod
-from typing import Callable, Iterable, Iterator, Optional, Set, Tuple, Union
-
-from .const import EventType
-from .utils import AttrDict
-
-
-def _tuple_of(obj, type_: type) -> tuple:
-    if not obj:
-        return tuple()
-    if isinstance(obj, type_):
-        obj = (obj,)
-
-    if not all(isinstance(elem, type_) for elem in obj):
-        raise TypeError()
-    return tuple(obj)
-
-
-class EventFilter(ABC):
-    """The base event filter.
-
-    :param func: A Callable (async or not) function that should accept the event as input
-                 parameter, and return a bool value indicating whether the event
-                 should be dispatched or not.
-    """
-
-    def __init__(self, func: Optional[Callable] = None):
-        self.func = func
-
-    @abstractmethod
-    def __hash__(self) -> int:
-        """Object's unique hash"""
-
-    @abstractmethod
-    def __eq__(self, other) -> bool:
-        """Return True if two event filters are equal."""
-
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
-    async def _call_func(self, event) -> bool:
-        if not self.func:
-            return True
-        res = self.func(event)
-        if inspect.isawaitable(res):
-            return await res
-        return res
-
-    @abstractmethod
-    async def filter(self, event):
-        """Return True-like value if the event passed the filter and should be
-        used, or False-like value otherwise.
-        """
-
-
-class RawEvent(EventFilter):
-    """Matches raw core events.
-
-    :param types: The types of event to match.
-    :param func: A Callable (async or not) function that should accept the event as input
-                 parameter, and return a bool value indicating whether the event
-                 should be dispatched or not.
-    """
-
-    def __init__(
-        self, types: Union[None, EventType, Iterable[EventType]] = None, **kwargs
-    ):
-        super().__init__(**kwargs)
-        try:
-            self.types = _tuple_of(types, EventType)
-        except TypeError as err:
-            raise TypeError(f"Invalid event type given: {types}") from err
-
-    def __hash__(self) -> int:
-        return hash((self.types, self.func))
-
-    def __eq__(self, other) -> bool:
-        if isinstance(other, RawEvent):
-            return (self.types, self.func) == (other.types, other.func)
-        return False
-
-    async def filter(self, event: AttrDict) -> bool:
-        if self.types and event.type not in self.types:
-            return False
-        return await self._call_func(event)
-
-
-class NewMessage(EventFilter):
-    """Matches whenever a new message arrives.
-
-    Warning: registering a handler for this event or any subclass will cause the messages
-    to be marked as read. Its usage is mainly intended for bots.
-    """
-
-    def __init__(
-        self,
-        pattern: Union[
-            None,
-            str,
-            Callable[[str], bool],
-            re.Pattern,
-        ] = None,
-        func: Optional[Callable[[AttrDict], bool]] = None,
-    ) -> None:
-        super().__init__(func=func)
-        if isinstance(pattern, str):
-            pattern = re.compile(pattern)
-        if isinstance(pattern, re.Pattern):
-            self.pattern: Optional[Callable] = pattern.match
-        elif not pattern or callable(pattern):
-            self.pattern = pattern
-        else:
-            raise TypeError("Invalid pattern type")
-
-    def __hash__(self) -> int:
-        return hash((self.pattern, self.func))
-
-    def __eq__(self, other) -> bool:
-        if type(other) is self.__class__:  # noqa
-            return (self.pattern, self.func) == (other.pattern, other.func)
-        return False
-
-    async def filter(self, event: AttrDict) -> bool:
-        if self.pattern:
-            match = self.pattern(event.text)
-            if inspect.isawaitable(match):
-                match = await match
-            if not match:
-                return False
-        return await super()._call_func(event)
-
-
-class NewInfoMessage(NewMessage):
-    """Matches whenever a new info/system message arrives."""
-
-
-class HookCollection:
-    """
-    Helper class to collect event hooks that can later be added to a Delta Chat client.
-    """
-
-    def __init__(self) -> None:
-        self._hooks: Set[Tuple[Callable, Union[type, EventFilter]]] = set()
-
-    def __iter__(self) -> Iterator[Tuple[Callable, Union[type, EventFilter]]]:
-        return iter(self._hooks)
-
-    def on(self, event: Union[type, EventFilter]) -> Callable:  # noqa
-        """Register decorated function as listener for the given event."""
-        if isinstance(event, type):
-            event = event()
-        assert isinstance(event, EventFilter), "Invalid event filter"
-
-        def _decorator(func) -> Callable:
-            self._hooks.add((func, event))
-            return func
-
-        return _decorator

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

@@ -1,49 +0,0 @@
-from typing import TYPE_CHECKING
-
-from .contact import Contact
-from .rpc import Rpc
-from .utils import AttrDict
-
-if TYPE_CHECKING:
-    from .account import Account
-
-
-class Message:
-    """Delta Chat Message object."""
-
-    def __init__(self, account: "Account", msg_id: int) -> None:
-        self.account = account
-        self.id = msg_id
-
-    def __eq__(self, other) -> bool:
-        if not isinstance(other, Message):
-            return False
-        return self.id == other.id and self.account == other.account
-
-    def __ne__(self, other) -> bool:
-        return not self == other
-
-    def __repr__(self) -> str:
-        return f"<Message id={self.id} account={self.account.id}>"
-
-    @property
-    def _rpc(self) -> Rpc:
-        return self.account._rpc
-
-    async def send_reaction(self, *reaction: str):
-        """Send a reaction to this message."""
-        await self._rpc.send_reaction(self.account.id, self.id, reaction)
-
-    async def get_snapshot(self) -> AttrDict:
-        """Get a snapshot with the properties of this message."""
-        from .chat import Chat
-
-        snapshot = AttrDict(await self._rpc.get_message(self.account.id, self.id))
-        snapshot["chat"] = Chat(self.account, snapshot.chat_id)
-        snapshot["sender"] = Contact(self.account, snapshot.from_id)
-        snapshot["message"] = self
-        return snapshot
-
-    async def mark_seen(self) -> None:
-        """Mark the message as seen."""
-        await self._rpc.markseen_msgs(self.account.id, [self.id])

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

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

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

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

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

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

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

@@ -1,114 +0,0 @@
-import argparse
-import asyncio
-import re
-import sys
-from typing import TYPE_CHECKING, Callable, Iterable, Optional, Tuple, Type, Union
-
-if TYPE_CHECKING:
-    from .client import Client
-    from .events import EventFilter
-
-
-def _camel_to_snake(name: str) -> str:
-    name = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", name)
-    name = re.sub("__([A-Z])", r"_\1", name)
-    name = re.sub("([a-z0-9])([A-Z])", r"\1_\2", name)
-    return name.lower()
-
-
-def _to_attrdict(obj):
-    if isinstance(obj, dict):
-        return AttrDict(obj)
-    if isinstance(obj, list):
-        return [_to_attrdict(elem) for elem in obj]
-    return obj
-
-
-class AttrDict(dict):
-    """Dictionary that allows accessing values usin the "dot notation" as attributes."""
-
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(
-            {
-                _camel_to_snake(key): _to_attrdict(value)
-                for key, value in dict(*args, **kwargs).items()
-            }
-        )
-
-    def __getattr__(self, attr):
-        if attr in self:
-            return self[attr]
-        raise AttributeError("Attribute not found: " + str(attr))
-
-    def __setattr__(self, attr, val):
-        if attr in self:
-            raise AttributeError("Attribute-style access is read only")
-        super().__setattr__(attr, val)
-
-
-async def run_client_cli(
-    hooks: Optional[Iterable[Tuple[Callable, Union[type, "EventFilter"]]]] = None,
-    argv: Optional[list] = None,
-    **kwargs
-) -> None:
-    """Run a simple command line app, using the given hooks.
-
-    Extra keyword arguments are passed to the internal Rpc object.
-    """
-    from .client import Client
-
-    await _run_cli(Client, hooks, argv, **kwargs)
-
-
-async def run_bot_cli(
-    hooks: Optional[Iterable[Tuple[Callable, Union[type, "EventFilter"]]]] = None,
-    argv: Optional[list] = None,
-    **kwargs
-) -> None:
-    """Run a simple bot command line using the given hooks.
-
-    Extra keyword arguments are passed to the internal Rpc object.
-    """
-    from .client import Bot
-
-    await _run_cli(Bot, hooks, argv, **kwargs)
-
-
-async def _run_cli(
-    client_type: Type["Client"],
-    hooks: Optional[Iterable[Tuple[Callable, Union[type, "EventFilter"]]]] = None,
-    argv: Optional[list] = None,
-    **kwargs
-) -> None:
-    from .deltachat import DeltaChat
-    from .rpc import Rpc
-
-    if argv is None:
-        argv = sys.argv
-
-    parser = argparse.ArgumentParser(prog=argv[0] if argv else None)
-    parser.add_argument(
-        "accounts_dir",
-        help="accounts folder (default: current working directory)",
-        nargs="?",
-    )
-    parser.add_argument("--email", action="store", help="email address")
-    parser.add_argument("--password", action="store", help="password")
-    args = parser.parse_args(argv[1:])
-
-    async with Rpc(accounts_dir=args.accounts_dir, **kwargs) as rpc:
-        deltachat = DeltaChat(rpc)
-        core_version = (await deltachat.get_system_info()).deltachat_core_version
-        accounts = await deltachat.get_all_accounts()
-        account = accounts[0] if accounts else await deltachat.add_account()
-
-        client = client_type(account, hooks)
-        client.logger.debug("Running deltachat core %s", core_version)
-        if not await client.is_configured():
-            assert (
-                args.email and args.password
-            ), "Account is not configured and email and password must be provided"
-            asyncio.create_task(
-                client.configure(email=args.email, password=args.password)
-            )
-        await client.run_forever()

deltachat-rpc-client/tests/test_something.py

@@ -1,246 +0,0 @@
-import pytest
-
-from deltachat_rpc_client import AttrDict, EventType, events
-from deltachat_rpc_client.rpc import JsonRpcError
-
-
-@pytest.mark.asyncio
-async def test_system_info(rpc) -> None:
-    system_info = await rpc.get_system_info()
-    assert "arch" in system_info
-    assert "deltachat_core_version" in system_info
-
-
-@pytest.mark.asyncio
-async def test_email_address_validity(rpc) -> None:
-    valid_addresses = [
-        "email@example.com",
-        "36aa165ae3406424e0c61af17700f397cad3fe8ab83d682d0bddf3338a5dd52e@yggmail@yggmail",
-    ]
-    invalid_addresses = ["email@", "example.com", "emai221"]
-
-    for addr in valid_addresses:
-        assert await rpc.check_email_validity(addr)
-    for addr in invalid_addresses:
-        assert not await rpc.check_email_validity(addr)
-
-
-@pytest.mark.asyncio
-async def test_acfactory(acfactory) -> None:
-    account = await acfactory.new_configured_account()
-    while True:
-        event = await account.wait_for_event()
-        if event.type == EventType.CONFIGURE_PROGRESS:
-            assert event.progress != 0  # Progress 0 indicates error.
-            if event.progress == 1000:  # Success
-                break
-        else:
-            print(event)
-    print("Successful configuration")
-
-
-@pytest.mark.asyncio
-async def test_account(acfactory) -> None:
-    alice, bob = await acfactory.get_online_accounts(2)
-
-    bob_addr = await bob.get_config("addr")
-    alice_contact_bob = await alice.create_contact(bob_addr, "Bob")
-    alice_chat_bob = await alice_contact_bob.create_chat()
-    await alice_chat_bob.send_text("Hello!")
-
-    while True:
-        event = await bob.wait_for_event()
-        if event.type == EventType.INCOMING_MSG:
-            chat_id = event.chat_id
-            msg_id = event.msg_id
-            break
-
-    message = await bob.get_message_by_id(msg_id)
-    snapshot = await message.get_snapshot()
-    assert snapshot.chat_id == chat_id
-    assert snapshot.text == "Hello!"
-    await bob.mark_seen_messages([message])
-
-    assert alice != bob
-    assert repr(alice)
-    assert (await alice.get_info()).level
-    assert await alice.get_size()
-    assert await alice.is_configured()
-    assert not await alice.get_avatar()
-    assert await alice.get_contact_by_addr(bob_addr) == alice_contact_bob
-    assert await alice.get_contacts()
-    assert await alice.get_contacts(snapshot=True)
-    assert alice.self_contact
-    assert await alice.get_chatlist()
-    assert await alice.get_chatlist(snapshot=True)
-    assert await alice.get_qr_code()
-    await alice.get_fresh_messages()
-    await alice.get_fresh_messages_in_arrival_order()
-
-    group = await alice.create_group("test group")
-    await group.add_contact(alice_contact_bob)
-    group_msg = await group.send_message(text="hello")
-    assert group_msg == await alice.get_message_by_id(group_msg.id)
-    assert group == await alice.get_chat_by_id(group.id)
-    await alice.delete_messages([group_msg])
-
-    await alice.set_config("selfstatus", "test")
-    assert await alice.get_config("selfstatus") == "test"
-    await alice.update_config(selfstatus="test2")
-    assert await alice.get_config("selfstatus") == "test2"
-
-    assert not await alice.get_blocked_contacts()
-    await alice_contact_bob.block()
-    blocked_contacts = await alice.get_blocked_contacts()
-    assert blocked_contacts
-    assert blocked_contacts[0].contact == alice_contact_bob
-
-    await bob.remove()
-    await alice.stop_io()
-
-
-@pytest.mark.asyncio
-async def test_chat(acfactory) -> None:
-    alice, bob = await acfactory.get_online_accounts(2)
-
-    bob_addr = await bob.get_config("addr")
-    alice_contact_bob = await alice.create_contact(bob_addr, "Bob")
-    alice_chat_bob = await alice_contact_bob.create_chat()
-    await alice_chat_bob.send_text("Hello!")
-
-    while True:
-        event = await bob.wait_for_event()
-        if event.type == EventType.INCOMING_MSG:
-            chat_id = event.chat_id
-            msg_id = event.msg_id
-            break
-    message = await bob.get_message_by_id(msg_id)
-    snapshot = await message.get_snapshot()
-    assert snapshot.chat_id == chat_id
-    assert snapshot.text == "Hello!"
-    bob_chat_alice = await bob.get_chat_by_id(chat_id)
-
-    assert alice_chat_bob != bob_chat_alice
-    assert repr(alice_chat_bob)
-    await alice_chat_bob.delete()
-    await bob_chat_alice.accept()
-    await bob_chat_alice.block()
-    bob_chat_alice = await snapshot.sender.create_chat()
-    await bob_chat_alice.mute()
-    await bob_chat_alice.unmute()
-    await bob_chat_alice.pin()
-    await bob_chat_alice.unpin()
-    await bob_chat_alice.archive()
-    await bob_chat_alice.unarchive()
-    with pytest.raises(JsonRpcError):  # can't set name for 1:1 chats
-        await bob_chat_alice.set_name("test")
-    await bob_chat_alice.set_ephemeral_timer(300)
-    await bob_chat_alice.get_encryption_info()
-
-    group = await alice.create_group("test group")
-    await group.add_contact(alice_contact_bob)
-    await group.get_qr_code()
-
-    snapshot = await group.get_basic_snapshot()
-    assert snapshot.name == "test group"
-    await group.set_name("new name")
-    snapshot = await group.get_full_snapshot()
-    assert snapshot.name == "new name"
-
-    msg = await group.send_message(text="hi")
-    assert (await msg.get_snapshot()).text == "hi"
-    await group.forward_messages([msg])
-
-    await group.set_draft(text="test draft")
-    draft = await group.get_draft()
-    assert draft.text == "test draft"
-    await group.remove_draft()
-    assert not await group.get_draft()
-
-    assert await group.get_messages()
-    await group.get_fresh_message_count()
-    await group.mark_noticed()
-    assert await group.get_contacts()
-    await group.remove_contact(alice_chat_bob)
-    await group.get_locations()
-
-
-@pytest.mark.asyncio
-async def test_contact(acfactory) -> None:
-    alice, bob = await acfactory.get_online_accounts(2)
-
-    bob_addr = await bob.get_config("addr")
-    alice_contact_bob = await alice.create_contact(bob_addr, "Bob")
-
-    assert alice_contact_bob == await alice.get_contact_by_id(alice_contact_bob.id)
-    assert repr(alice_contact_bob)
-    await alice_contact_bob.block()
-    await alice_contact_bob.unblock()
-    await alice_contact_bob.set_name("new name")
-    await alice_contact_bob.get_encryption_info()
-    snapshot = await alice_contact_bob.get_snapshot()
-    assert snapshot.address == bob_addr
-    await alice_contact_bob.create_chat()
-
-
-@pytest.mark.asyncio
-async def test_message(acfactory) -> None:
-    alice, bob = await acfactory.get_online_accounts(2)
-
-    bob_addr = await bob.get_config("addr")
-    alice_contact_bob = await alice.create_contact(bob_addr, "Bob")
-    alice_chat_bob = await alice_contact_bob.create_chat()
-    await alice_chat_bob.send_text("Hello!")
-
-    while True:
-        event = await bob.wait_for_event()
-        if event.type == EventType.INCOMING_MSG:
-            chat_id = event.chat_id
-            msg_id = event.msg_id
-            break
-
-    message = await bob.get_message_by_id(msg_id)
-    snapshot = await message.get_snapshot()
-    assert snapshot.chat_id == chat_id
-    assert snapshot.text == "Hello!"
-    assert repr(message)
-
-    with pytest.raises(JsonRpcError):  # chat is not accepted
-        await snapshot.chat.send_text("hi")
-    await snapshot.chat.accept()
-    await snapshot.chat.send_text("hi")
-
-    await message.mark_seen()
-    await message.send_reaction("😎")
-
-
-@pytest.mark.asyncio
-async def test_bot(acfactory) -> None:
-    async def callback(e):
-        res.append(e)
-
-    res = []
-    bot = await acfactory.new_configured_bot()
-    assert await bot.is_configured()
-    assert await bot.account.get_config("bot") == "1"
-
-    bot.add_hook(callback, events.RawEvent(EventType.INFO))
-    info_event = AttrDict(account=bot.account, type=EventType.INFO, msg="info")
-    warn_event = AttrDict(account=bot.account, type=EventType.WARNING, msg="warning")
-    await bot._on_event(info_event)
-    await bot._on_event(warn_event)
-    assert info_event in res
-    assert warn_event not in res
-    assert len(res) == 1
-
-    res = []
-    bot.add_hook(callback, events.NewMessage(r"hello"))
-    snapshot1 = AttrDict(text="hello")
-    snapshot2 = AttrDict(text="hello, world")
-    snapshot3 = AttrDict(text="hey!")
-    for snapshot in [snapshot1, snapshot2, snapshot3]:
-        await bot._on_event(snapshot, events.NewMessage)
-    assert len(res) == 2
-    assert snapshot1 in res
-    assert snapshot2 in res
-    assert snapshot3 not in res

deltachat-rpc-client/tox.ini

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

deltachat-rpc-server/Cargo.toml

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

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

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

draft/aeap-mvp.md

@@ -1,127 +0,0 @@
-AEAP MVP
-========
-
-Changes to the UIs
-------------------
-
-- The secondary self addresses (see below) are shown in the UI, but not editable.
-
-- When the user changed the email address in the configure screen, show a dialog to the user, either directly explaining things or with a link to the FAQ (see "Other" below)
-
-Changes in the core
--------------------
-
-- [x] We have one primary self address and any number of secondary self addresses. `is_self_addr()` checks all of them.
-
-- [x] If the user does a reconfigure and changes the email address, the previous address is added as a secondary self address.
-
-  - don't forget to deduplicate secondary self addresses in case the user switches back and forth between addresses).
-
-  - The key stays the same.
-
-- [x] No changes for 1:1 chats, there simply is a new one. (This works since, contrary to group messages, messages sent to a 1:1 chat are not assigned to the group chat but always to the 1:1 chat with the sender. So it's not a problem that the new messages might be put into the old chat if they are a reply to a message there.)
-
-- [ ] When sending a message: If any of the secondary self addrs is in the chat's member list, remove it locally (because we just transitioned away from it). We add a log message for this (alternatively, a system message in the chat would be more visible).
-
-- [x] ([#3385](https://github.com/deltachat/deltachat-core-rust/pull/3385)) When receiving a message: If the key exists, but belongs to another address (we may want to benchmark this)
-  AND there is a `Chat-Version` header\
-  AND the message is signed correctly
-  AND the From address is (also) in the encrypted (and therefore signed) headers <sup>[[1]](#myfootnote1)</sup>\
-  AND the message timestamp is newer than the contact's `lastseen` (to prevent changing the address back when messages arrive out of order) (this condition is not that important since we will have eventual consistency even without it):
-
-  Replace the contact in _all_ groups, possibly deduplicate the members list, and add a system message to all of these chats.
-  
-  - Note that we can't simply compare the keys byte-by-byte, since the UID may have changed, or the sender may have rotated the key and signed the new key with the old one.
-
-<a name="myfootnote1">[1]</a>: Without this check, an attacker could replay a message from Alice to Bob. Then Bob's device would do an AEAP transition from Alice's to the attacker's address, allowing for easier phishing.
-
-<details>
-<summary>More details about this</summary>
-Suppose Alice sends a message to Evil (or to a group with both Evil and Bob). Evil then forwards the message to Bob, changing the From and To headers (and if necessary Message-Id) and replacing `addr=alice@example.org;` in the autocrypt header with `addr=evil@example.org;`.
-
-Then Bob's device sees that there is a message which is signed by Alice's key and comes from Evil's address and would do the AEAP transition, i.e. replace Alice with Evil in all groups and show a message "Alice changed their address from alice@example.org to evil@example.org". Disadvantages for Evil are that Bob's message will be shown on Alice's device, possibly creating confusion/suspicion, and that the usual "Setup changed for..." message will be shown the next time Evil sends a message (because Evil doesn't know Alice's private key).
-
-Possible mitigations:
-- if we make the AEAP device message sth. like "Automatically removed alice@example.org and added evil@example.org", then this will create more suspicion, making the phishing harder (we didn't talk about what what the wording should be at all yet).
-- Add something similar to replay protection to our Autocrypt implementation. This could be done e.g. by adding a second `From` header to the protected headers. If it's present, the receiver then requires it to be the same as the outer `From`, and if it's not present, we don't do AEAP --> **That's what we implemented**
-
-Note that usually a mail is signed by a key that has a UID matching the from address.
-
-  That's not mandatory for Autocrypt (and in fact, we just keep the old UID when changing the self address, so with AEAP the UID will actually be different than the from address sometimes)
-
-  https://autocrypt.org/level1.html#openpgp-based-key-data says:
-  > The content of the user id packet is only decorative
-
-</details>
-
-### Notes:
-  
-- We treat protected and non-protected chats the same
-- We leave the aeap transition statement away since it seems not to be needed, makes things harder on the sending side, wastes some network traffic, and is worse for privacy (since more pepole know what old addresses you had).
-- As soon as we encrypt read receipts, sending a read receipt will be enough to tell a lot of people that you transitioned
-- AEAP will make the problem of inconsistent group state worse, both because it doesn't work if the message is unencrypted (even if the design allowed it, it would be problematic security-wise) and because some chat partners may have gotten the transition and some not. We should do something against this at some point in the future, like asking the user whether they want to add/remove the members to restore consistent group state.
-
-#### Downsides of this design:
-- Inconsistent group state: Suppose Alice does an AEAP transition and sends a 1:1 message to Bob, so Bob rewrites Alice's contact. Alice, Bob and Charlie are together in a group. Before Alice writes to this group, Bob and Charlie will have different membership lists, and Bob will send messages to Alice's new address, while Charlie will send them to her old address.
-
-#### Upsides:
-- With this approach, it's easy to switch to a model where the info about the transition is encoded in the PGP key. Since the key is gossiped, the information about the transition will spread virally.
-- Faster transation: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.
-
-### Alternatives and old discussions/plans:
-
-- Change the contact instead of rewriting the group member lists. This seems to call for more trouble since we will end up with multiple contacts having the same email address.
-
-- If needed, we could add a header a) indicating that the sender did an address transition or b) listing all the secondary (old) addresses.  For now, there is no big enough benefit to warrant introducing another header and its processing on the receiver side (including all the neccessary checks and handling of error cases). Instead, we only check for the `Chat-Version` header to prevent accidental transitions when an MUA user sends a message from another email address with the same key.
-
-- The condition for a transition temporarily was:
-
-  > When receiving a message: If we are going to assign a message to a chat, but the sender is not a member of this chat\
-  > AND the signing key is the same as the direct (non-gossiped) key of one of the chat members\
-  > AND ...
-
-  However, this would mean that in 1:1 messages can't trigger a transition, since we don't assign private messages to the parent chat, but always to the 1:1 chat with the sender.
-  
-<details>
-<summary>Some previous state of the discussion, which temporarily lived in an issue description</summary>
-Summarizing the discussions from https://github.com/deltachat/deltachat-core-rust/pull/2896, mostly quoting @hpk42:
-
-1. (DONE) At the time of configure we push the current primary to become a secondary. 
-
-2. When a message is sent out to a chat, and the message is encrypted, and we have secondary addresses, then we 
-  a) add a protected "AEAP-Replacement" header that contains all secondary addresses 
-  b) if any of the secondary addresses is in the chat's member list, we remove it and leave a system message that we did so
-3. When an encrypted message with a replacement header is received, replace the e-mail address of all secondary contacts (if they exist) with the new primary and drop a sysmessage in all chats the secondary is member off.  This might (in edge cases) result in chats that have two or more contacts with the same e-mail address.  We might ignore this for a first release and just log a warning.  Let's maybe not get hung up on this case before everything else works. 
-
-Notes: 
-- for now we will send out aeap replacement headers forever, there is no termination condition other than lack of secondary addresses.  I think that's fine for now.  Later on we might introduce options to remove secondary addresses but i wouldn't do this for a first release/PR. 
-- the design is resilient against changing e-mail providers from A to B to C and then back to A, with partially updated chats and diverging views from recipients/contacts on this transition.  In the end, you will have a primary and some secondaries, and when you start sending out messages everybody will eventually synchronize when they receive the current state of primaries/secondaries. 
-- of course on incoming message for need to check for each stated secondary address in the replacement header that it uses the same signature as the signature we verified as valid with the incoming message  **-->  Also we have to somehow make sure that the signing key was not just gossiped from some random other person in some group.**
-- there are no extra flags/columns in the database needed (i hope) 
-
-#### Downsides of the chosen approach:
-- Inconsistent group state: Suppose Alice does an AEAP transition and sends a 1:1 message to Bob, so Bob rewrites Alice's contact. Alice, Bob and Charlie are together in a group. Before Alice writes to this group, Bob and Charlie will have different membership lists, and Bob will send messages to Alice's new address, while Charlie will send them to her old address.
-- There will be multiple contacts with the same address in the database. We will have to do something against this at some point.
-
-The most obvious alternative would be to create a new contact with the new address and replace the old contact in the groups.
-
-#### Upsides:
-- With this approach, it's easier to switch to a model where the info about the transition is encoded in the PGP key. Since the key is gossiped, the information about the transition will spread virally.
-- (Also, less important: Slightly faster transation: If you send a message to e.g. "Delta Chat Dev", all members of the "sub-group" "delta android" will know of your transition.)
-- It's easier to implement (if too many problems turn up, we can still switch to another approach and didn't wast that much development time.)
-
-[full messages](https://github.com/deltachat/deltachat-core-rust/pull/2896#discussion_r852002161)
-  
-_end of the previous state of the discussion_  
-
-</details>
-  
-Other
------
-
-- The user is responsible that messages to the old address arrive at the new address, for example by configuring the old provider to forward all emails to the new one.
-
-Notes during implementing
-========================
-
-- As far as I understand the code, unencrypted messages are unsigned. So, the transition only works if both sides have the other side's key.

draft/aeap-mvp.rst

@@ -0,0 +1,33 @@
+AEAP MVP
+========
+
+Changes to the UIs
+------------------
+
+- The secondary self addresses (see below) are shown in the UI, but not editable.
+
+- When the user changed the email address in the configure screen, show a dialog to the user, either directly explaining things or with a link to the FAQ (see "Other" below)
+
+Changes in the core
+-------------------
+
+- We have one primary self address and any number of secondary self addresses. `is_self_addr()` checks all of them.
+
+- If the user does a reconfigure and changes the email address, the previous address is added as a secondary self address.
+
+  - don't forget to deduplicate secondary self addresses in case the user switches back and forth between addresses).
+
+  - The key stays the same.
+
+- No changes for 1:1 chats, there simply is a new one
+
+- When we send a message to a group, and the primary address is not a member of a group, but a secondary address is:
+  
+  Add Chat-Group-Member-Removed=<old address> and Chat-Group-Member-Added=<new address> headers to this message
+
+  - On the receiving side, make sure that we accept this (even in verified groups) if the message is signed and the key stayed the same
+
+Other
+-----
+
+- The user is responsible that messages to the old address arrive at the new address, for example by configuring the old provider to forward all emails to the new one.

draft/webxdc-dev-reference.md

@@ -1,20 +1,12 @@
 # Webxdc Developer Reference
 
-This document gives a quick overview about the Webxdc specification,
-It is meant for both, developing Webxdc apps
-and developing Webxdc implementations.
-
-The [Webxdc guidebook](https://docs.webxdc.org/) shows more detailed information
-when developing Webxdc apps.
-
-
 ## Webxdc File Format
 
-- a **Webxdc** is a **ZIP-file** with the extension `.xdc`
+- a **Webxdc app** is a **ZIP-file** with the extension `.xdc`
 - the ZIP-file must use the default compression methods as of RFC 1950,
   this is "Deflate" or "Store"
 - the ZIP-file must contain at least the file `index.html`
-- if the Webxdc is started, `index.html` is opened in a restricted webview
+- if the Webxdc app is started, `index.html` is opened in a restricted webview
   that allow accessing resources only from the ZIP-file
 
 
@@ -34,19 +26,16 @@ no need to add `webxdc.js` to your ZIP-file):
 window.webxdc.sendUpdate(update, descr);
 ```
 
-A Webxdc is usually shared in a chat and run independently on each peer.
+Webxdc apps are usually shared in a chat and run independently on each peer.
 To get a shared state, the peers use `sendUpdate()` to send updates to each other.
 
 - `update`: an object with the following properties:  
     - `update.payload`: any javascript primitive, array or object.
     - `update.info`: optional, short, informational message that will be added to the chat,
-       eg. "Alice voted" or "Bob scored 123 in MyGame".
-       usually only one line of text is shown
-       and if there are series of info messages, older ones may be dropped.
+       eg. "Alice voted" or "Bob scored 123 in MyGame";
+       usually only one line of text is shown,
        use this option sparingly to not spam the chat.
-    - `update.document`: optional, name of the document in edit,
-       must not be used eg. in games where the Webxdc does not create documents
-    - `update.summary`: optional, short text, shown beside Webxdc icon;
+    - `update.summary`: optional, short text, shown beside app icon;
        it is recommended to use some aggregated value,  eg. "8 votes", "Highscore: 123"
 
 - `descr`: short, human-readable description what this update is about.
@@ -85,12 +74,9 @@ Each `update` which is passed to the callback comes with the following propertie
 - `update.max_serial`: the maximum serial currently known.
   If `max_serial` equals `serial` this update is the last update (until new network messages arrive).
 
-- `update.info`: optional, short, informational message (see `sendUpdate()`)
+- `update.info`: optional, short, informational message (see `send_update`) 
 
-- `update.document`: optional, document name as set by the sender, (see `sendUpdate()`),
-  implementations show the document name eg. beside the app icon or in the title bar
-
-- `update.summary`: optional, short text, shown beside icon (see `sendUpdate()`)
+- `update.summary`: optional, short text, shown beside app icon (see `send_update`)
 
 
 ### selfAddr
@@ -124,57 +110,25 @@ some basic information are read and used from there.
 the `manifest.toml` has the following format
 
 ```toml
-name = "My Name"
-source_code_url = "https://example.org/orga/repo"
+name = "My App Name"
 ```
 
-- `name` - The name of the Webxdc.
-  If no name is set or if there is no manifest, the filename is used as the Webxdc name.
-
-- `source_code_url` - Optional URL where the source code of the Webxdc and maybe other information can be found.
-  UI may make the url accessible via a "Help" menu in the Webxdc window.
+- **name** - The name of the app.
+  If no name is set or if there is no manifest, the filename is used as the app name.
 
 
-## Webxdc Icon
+## App Icon
 
 If the ZIP-root contains an `icon.png` or `icon.jpg`,
-these files are used as the icon for the Webxdc.
+these files are used as the icon for the app.
 The icon should be a square at reasonable width/height;
 round corners etc. will be added by the implementations as needed.
 If no icon is set, a default icon will be used.
 
 
-## Other APIs and Tags Usage Hints
-
-- `localStorage`, `sessionStorage`, `indexedDB` are okay to be used
-- `visibilitychange`-events are okay to be used
-- `window.navigator.language` is okay to be used, on desktop it is the system language
-- `<a href="localfile.html">` and other internal links are okay to be used
-- `<a href="mailto:addr@example.org?body=...">`- mailto links are okay to be used
-- `<meta name="viewport" ...>` usage is okay to be used
-  and useful esp. different webviews have different defaults
-
-
-### Discouraged Things
-
-- `document.cookie` is known not to work on desktop and iOS
-  use `localStorage` instead
-- `unload`-, `beforeunload`- and `pagehide`-events are known not to work on iOS and are flaky on other systems
-  (also partly discouraged by [mozilla](https://developer.mozilla.org/en-US/docs/Web/API/Window/unload_event))
-  use `visibilitychange` instead
-- `<title>` and `document.title` is ignored by Webxdc;
-  use the `name` property from `manifest.toml` instead
-- newest js features may not work on all webviews,
-  you may want to transpile your code down to an older js version
-  eg. with <https://babeljs.io>
-- `<a href="https://example.org/foo">` and other external links are blocked by definition;
-  instead, embed content or use `mailto:` link to offer a way for contact
-- `<input type="file">` is discouraged currently; this may change in future
-
-
 ## Webxdc Examples
 
-The following example shows an input field and every input is show on all peers.
+The following example shows an input field and  every input is show on all peers.
 
 ```html
 <!DOCTYPE html>
@@ -204,10 +158,28 @@ The following example shows an input field and every input is show on all peers.
 </html>
 ```
 
-More examples at [github.com/webxdc](https://github.com/webxdc) and
-[topic #webxdc](https://github.com/topics/webxdc)
-
-[github.com/webxdc/hello](https://github.com/webxdc/hello)
-offers an **Webxdc Tool** that can be used in many browsers without any installation needed.
-You can also use that repository as a template for your own Webxdc -
+[Webxdc Development Tool](https://github.com/deltachat/webxdc-dev)
+offers an **Webxdc Simulator** that can be used in many browsers without any installation needed.
+You can also use that repository as a template for your own app -
 just clone and start adapting things to your need.
+
+
+### Advanced Examples
+
+- [2048](https://github.com/adbenitez/2048.xdc)
+- [Draw](https://github.com/adbenitez/draw.xdc)
+- [Poll](https://github.com/r10s/webxdc-poll/)
+- [Tic Tac Toe](https://github.com/Simon-Laux/tictactoe.xdc)
+- Even more with [Topic #webxdc on Github](https://github.com/topics/webxdc)
+
+
+## Closing Remarks
+
+- older devices might not have the newest js features in their webview,
+  you may want to transpile your code down to an older js version eg. with https://babeljs.io
+- viewport and scaling features are implementation specific,
+  if you want to have an explicit behavior, you can add eg.
+  `<meta name="viewport" content="initial-scale=1; user-scalable=no">` to your Webxdc
+- there are tons of ideas for enhancements of the API and the file format,
+  eg. in the future, we will may define icon- and manifest-files,
+  allow to aggregate the state or add metadata.

examples/repl/cmdline.rs

@@ -1,11 +1,9 @@
-#![allow(clippy::format_push_string)]
 extern crate dirs;
 
-use std::path::Path;
 use std::str::FromStr;
-use std::time::{Duration, SystemTime};
 
 use anyhow::{bail, ensure, Result};
+use async_std::path::Path;
 use deltachat::chat::{
     self, Chat, ChatId, ChatItem, ChatVisibility, MuteDuration, ProtectionStatus,
 };
@@ -13,6 +11,8 @@ use deltachat::chatlist::*;
 use deltachat::constants::*;
 use deltachat::contact::*;
 use deltachat::context::*;
+use deltachat::dc_receive_imf::*;
+use deltachat::dc_tools::*;
 use deltachat::download::DownloadState;
 use deltachat::imex::*;
 use deltachat::location;
@@ -20,12 +20,10 @@ use deltachat::log::LogExt;
 use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
 use deltachat::peerstate::*;
 use deltachat::qr::*;
-use deltachat::reaction::send_reaction;
-use deltachat::receive_imf::*;
 use deltachat::sql;
-use deltachat::tools::*;
 use deltachat::{config, provider};
-use tokio::fs;
+use std::fs;
+use std::time::{Duration, SystemTime};
 
 /// Reset database tables.
 /// Argument is a bitmask, executing single or multiple actions in one call.
@@ -98,10 +96,10 @@ async fn reset_tables(context: &Context, bits: i32) {
 }
 
 async fn poke_eml_file(context: &Context, filename: impl AsRef<Path>) -> Result<()> {
-    let data = read_file(context, filename).await?;
+    let data = dc_read_file(context, filename).await?;
 
-    if let Err(err) = receive_imf(context, &data, false).await {
-        println!("receive_imf errored: {:?}", err);
+    if let Err(err) = dc_receive_imf(context, &data, false).await {
+        println!("dc_receive_imf errored: {:?}", err);
     }
     Ok(())
 }
@@ -130,20 +128,24 @@ async fn poke_spec(context: &Context, spec: Option<&str>) -> bool {
         }
         real_spec = rs.unwrap();
     }
-    if let Some(suffix) = get_filesuffix_lc(&real_spec) {
+    if let Some(suffix) = dc_get_filesuffix_lc(&real_spec) {
         if suffix == "eml" && poke_eml_file(context, &real_spec).await.is_ok() {
             read_cnt += 1
         }
     } else {
         /* import a directory */
         let dir_name = std::path::Path::new(&real_spec);
-        let dir = fs::read_dir(dir_name).await;
+        let dir = std::fs::read_dir(dir_name);
         if dir.is_err() {
             error!(context, "Import: Cannot open directory \"{}\".", &real_spec,);
             return false;
         } else {
-            let mut dir = dir.unwrap();
-            while let Ok(Some(entry)) = dir.next_entry().await {
+            let dir = dir.unwrap();
+            for entry in dir {
+                if entry.is_err() {
+                    break;
+                }
+                let entry = entry.unwrap();
                 let name_f = entry.file_name();
                 let name = name_f.to_string_lossy();
                 if name.ends_with(".eml") {
@@ -189,7 +191,7 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
         DownloadState::Failure => " [⬇ Download failed]",
     };
 
-    let temp2 = timestamp_to_str(msg.get_timestamp());
+    let temp2 = dc_timestamp_to_str(msg.get_timestamp());
     let msgtext = msg.get_text();
     println!(
         "{}{}{}{}: {} (Contact#{}): {} {}{}{}{}{}{}{} [{}]",
@@ -217,14 +219,6 @@ async fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
                 msg.get_videochat_url().unwrap_or_default(),
                 msg.get_videochat_type().unwrap_or_default()
             )
-        } else if msg.get_viewtype() == Viewtype::Webxdc {
-            match msg.get_webxdc_info(context).await {
-                Ok(info) => format!(
-                    "[WEBXDC: {}, icon={}, document={}, summary={}, source_code_url={}]",
-                    info.name, info.icon, info.document, info.summary, info.source_code_url
-                ),
-                Err(err) => format!("[get_webxdc_info() failed: {}]", err),
-            }
         } else {
             "".to_string()
         },
@@ -408,7 +402,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                  resend <msg-id>\n\
                  markseen <msg-id>\n\
                  delmsg <msg-id>\n\
-                 react <msg-id> [<reaction>]\n\
                  ===========================Contact commands==\n\
                  listcontacts [<query>]\n\
                  listverified [<query>]\n\
@@ -499,7 +492,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             let setup_code = create_setup_code(&context);
             let file_name = blobdir.join("autocrypt-setup-message.html");
             let file_content = render_setup_file(&context, &setup_code).await?;
-            fs::write(&file_name, file_content).await?;
+            async_std::fs::write(&file_name, file_content).await?;
             println!(
                 "Setup message written to: {}\nSetup code: {}",
                 file_name.display(),
@@ -539,7 +532,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 .join("connectivity.html");
             match context.get_connectivity_html().await {
                 Ok(html) => {
-                    fs::write(&file, html).await?;
+                    fs::write(&file, html)?;
                     println!("Report written to: {:#?}", file);
                 }
                 Err(err) => {
@@ -554,11 +547,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             sql::housekeeping(&context).await.ok_or_log(&context);
         }
         "listchats" | "listarchived" | "chats" => {
-            let listflags = if arg0 == "listarchived" {
-                DC_GCL_ARCHIVED_ONLY
-            } else {
-                0
-            };
+            let listflags = if arg0 == "listarchived" { 0x01 } else { 0 };
             let time_start = std::time::SystemTime::now();
             let chatlist = Chatlist::try_load(
                 &context,
@@ -608,7 +597,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                             _ => "",
                         }
                     };
-                    let timestr = timestamp_to_str(summary.timestamp);
+                    let timestr = dc_timestamp_to_str(summary.timestamp);
                     println!(
                         "{}{}{} [{}]{}",
                         summary
@@ -650,13 +639,14 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
 
             let time_start = std::time::SystemTime::now();
             let msglist =
-                chat::get_chat_msgs(&context, sel_chat.get_id(), DC_GCM_ADDDAYMARKER).await?;
+                chat::get_chat_msgs(&context, sel_chat.get_id(), DC_GCM_ADDDAYMARKER, None).await?;
             let time_needed = time_start.elapsed().unwrap_or_default();
 
             let msglist: Vec<MsgId> = msglist
                 .into_iter()
                 .map(|x| match x {
                     ChatItem::Message { msg_id } => msg_id,
+                    ChatItem::Marker1 => MsgId::new(DC_MSG_ID_MARKER1),
                     ChatItem::DayMarker { .. } => MsgId::new(DC_MSG_ID_DAYMARKER),
                 })
                 .collect();
@@ -821,7 +811,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 println!(
                     "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} {} {}",
                     location.location_id,
-                    timestamp_to_str(location.timestamp),
+                    dc_timestamp_to_str(location.timestamp),
                     location.latitude,
                     location.longitude,
                     location.accuracy,
@@ -903,7 +893,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             ensure!(sel_chat.is_some(), "No chat selected.");
             ensure!(!arg1.is_empty(), "No html-file given.");
             let path: &Path = arg1.as_ref();
-            let html = &*fs::read(&path).await?;
+            let html = &*fs::read(&path)?;
             let html = String::from_utf8_lossy(html);
 
             let mut msg = Message::new(Viewtype::Text);
@@ -989,9 +979,11 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             chat::add_device_msg(&context, None, Some(&mut msg)).await?;
         }
         "listmedia" => {
+            ensure!(sel_chat.is_some(), "No chat selected.");
+
             let images = chat::get_chat_media(
                 &context,
-                sel_chat.map(|c| c.id),
+                sel_chat.as_ref().unwrap().get_id(),
                 Viewtype::Image,
                 Viewtype::Gif,
                 Viewtype::Video,
@@ -1088,7 +1080,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
                 .unwrap_or_default()
                 .join(format!("msg-{}.html", id.to_u32()));
             let html = id.get_html(&context).await?.unwrap_or_default();
-            fs::write(&file, html).await?;
+            fs::write(&file, html)?;
             println!("HTML written to: {:#?}", file);
         }
         "listfresh" => {
@@ -1127,12 +1119,6 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             ids[0] = MsgId::new(arg1.parse()?);
             message::delete_msgs(&context, &ids).await?;
         }
-        "react" => {
-            ensure!(!arg1.is_empty(), "Argument <msg-id> missing.");
-            let msg_id = MsgId::new(arg1.parse()?);
-            let reaction = arg2;
-            send_reaction(&context, msg_id, reaction).await?;
-        }
         "listcontacts" | "contacts" | "listverified" => {
             let contacts = Contact::get_all(
                 &context,
@@ -1248,8 +1234,8 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
         "fileinfo" => {
             ensure!(!arg1.is_empty(), "Argument <file> missing.");
 
-            if let Ok(buf) = read_file(&context, &arg1).await {
-                let (width, height) = get_filemeta(&buf)?;
+            if let Ok(buf) = dc_read_file(&context, &arg1).await {
+                let (width, height) = dc_get_filemeta(&buf)?;
                 println!("width={}, height={}", width, height);
             } else {
                 bail!("Command failed.");

examples/repl/main.rs

@@ -9,21 +9,20 @@ extern crate deltachat;
 
 use std::borrow::Cow::{self, Borrowed, Owned};
 use std::io::{self, Write};
-use std::path::Path;
 use std::process::Command;
 
 use ansi_term::Color;
 use anyhow::{bail, Error};
+use async_std::path::Path;
 use deltachat::chat::ChatId;
 use deltachat::config;
 use deltachat::context::*;
 use deltachat::oauth2::*;
-use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::securejoin::*;
-use deltachat::stock_str::StockStrings;
-use deltachat::{EventType, Events};
+use deltachat::EventType;
 use log::{error, info, warn};
 use rustyline::completion::{Completer, FilenameCompleter, Pair};
+use rustyline::config::OutputStreamType;
 use rustyline::error::ReadlineError;
 use rustyline::highlight::{Highlighter, MatchingBracketHighlighter};
 use rustyline::hint::{Hinter, HistoryHinter};
@@ -31,11 +30,11 @@ use rustyline::validate::Validator;
 use rustyline::{
     Cmd, CompletionType, Config, Context as RustyContext, EditMode, Editor, Helper, KeyEvent,
 };
-use tokio::fs;
-use tokio::runtime::Handle;
 
 mod cmdline;
 use self::cmdline::*;
+use deltachat::qr_code_generator::get_securejoin_qr_svg;
+use std::fs;
 
 /// Event Handler
 fn receive_event(event: EventType) {
@@ -72,19 +71,6 @@ fn receive_event(event: EventType) {
                 ))
             );
         }
-        EventType::ReactionsChanged {
-            chat_id,
-            msg_id,
-            contact_id,
-        } => {
-            info!(
-                "{}",
-                yellow.paint(format!(
-                    "Received REACTIONS_CHANGED(chat_id={}, msg_id={}, contact_id={})",
-                    chat_id, msg_id, contact_id
-                ))
-            );
-        }
         EventType::ContactsChanged(_) => {
             info!("{}", yellow.paint("Received CONTACTS_CHANGED()"));
         }
@@ -221,7 +207,7 @@ const CHAT_COMMANDS: [&str; 36] = [
     "accept",
     "blockchat",
 ];
-const MESSAGE_COMMANDS: [&str; 9] = [
+const MESSAGE_COMMANDS: [&str; 8] = [
     "listmsgs",
     "msginfo",
     "listfresh",
@@ -230,7 +216,6 @@ const MESSAGE_COMMANDS: [&str; 9] = [
     "markseen",
     "delmsg",
     "download",
-    "react",
 ];
 const CONTACT_COMMANDS: [&str; 9] = [
     "listcontacts",
@@ -313,10 +298,10 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         println!("Error: Bad arguments, expected [db-name].");
         bail!("No db-name specified");
     }
-    let context = Context::new(Path::new(&args[1]), 0, Events::new(), StockStrings::new()).await?;
+    let context = Context::new(Path::new(&args[1]).to_path_buf(), 0).await?;
 
     let events = context.get_event_emitter();
-    tokio::task::spawn(async move {
+    async_std::task::spawn(async move {
         while let Some(event) = events.recv().await {
             receive_event(event.typ);
         }
@@ -328,17 +313,17 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         .history_ignore_space(true)
         .completion_type(CompletionType::List)
         .edit_mode(EditMode::Emacs)
+        .output_stream(OutputStreamType::Stdout)
         .build();
     let mut selected_chat = ChatId::default();
-
-    let ctx = context.clone();
-    let input_loop = tokio::task::spawn_blocking(move || {
+    let (reader_s, reader_r) = async_std::channel::bounded(100);
+    let input_loop = async_std::task::spawn_blocking(move || {
         let h = DcHelper {
             completer: FilenameCompleter::new(),
             highlighter: MatchingBracketHighlighter::new(),
             hinter: HistoryHinter {},
         };
-        let mut rl = Editor::with_config(config)?;
+        let mut rl = Editor::with_config(config);
         rl.set_helper(Some(h));
         rl.bind_sequence(KeyEvent::alt('N'), Cmd::HistorySearchForward);
         rl.bind_sequence(KeyEvent::alt('P'), Cmd::HistorySearchBackward);
@@ -354,30 +339,16 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
                 Ok(line) => {
                     // TODO: ignore "set mail_pw"
                     rl.add_history_entry(line.as_str());
-                    let contine = Handle::current().block_on(async {
-                        match handle_cmd(line.trim(), ctx.clone(), &mut selected_chat).await {
-                            Ok(ExitResult::Continue) => true,
-                            Ok(ExitResult::Exit) => {
-                                println!("Exiting ...");
-                                false
-                            }
-                            Err(err) => {
-                                println!("Error: {}", err);
-                                true
-                            }
-                        }
-                    });
-
-                    if !contine {
-                        break;
-                    }
+                    async_std::task::block_on(reader_s.send(line)).unwrap();
                 }
                 Err(ReadlineError::Interrupted) | Err(ReadlineError::Eof) => {
                     println!("Exiting...");
+                    drop(reader_s);
                     break;
                 }
                 Err(err) => {
                     println!("Error: {}", err);
+                    drop(reader_s);
                     break;
                 }
             }
@@ -388,8 +359,15 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         Ok::<_, Error>(())
     });
 
+    while let Ok(line) = reader_r.recv().await {
+        match handle_cmd(line.trim(), context.clone(), &mut selected_chat).await {
+            Ok(ExitResult::Continue) => {}
+            Ok(ExitResult::Exit) => break,
+            Err(err) => println!("Error: {}", err),
+        }
+    }
     context.stop_io().await;
-    input_loop.await??;
+    input_loop.await?;
 
     Ok(())
 }
@@ -422,7 +400,7 @@ async fn handle_cmd(
         "oauth2" => {
             if let Some(addr) = ctx.get_config(config::Config::Addr).await? {
                 let oauth2_url =
-                    get_oauth2_url(&ctx, &addr, "chat.delta:/com.b44t.messenger").await?;
+                    dc_get_oauth2_url(&ctx, &addr, "chat.delta:/com.b44t.messenger").await?;
                 if oauth2_url.is_none() {
                     println!("OAuth2 not available for {}.", &addr);
                 } else {
@@ -439,14 +417,14 @@ async fn handle_cmd(
         "getqr" | "getbadqr" => {
             ctx.start_io().await;
             let group = arg1.parse::<u32>().ok().map(ChatId::new);
-            let mut qr = get_securejoin_qr(&ctx, group).await?;
+            let mut qr = dc_get_securejoin_qr(&ctx, group).await?;
             if !qr.is_empty() {
                 if arg0 == "getbadqr" && qr.len() > 40 {
                     qr.replace_range(12..22, "0000000000")
                 }
                 println!("{}", qr);
                 let output = Command::new("qrencode")
-                    .args(["-t", "ansiutf8", qr.as_str(), "-o", "-"])
+                    .args(&["-t", "ansiutf8", qr.as_str(), "-o", "-"])
                     .output()
                     .expect("failed to execute process");
                 io::stdout().write_all(&output.stdout).unwrap();
@@ -459,7 +437,7 @@ async fn handle_cmd(
             let file = dirs::home_dir().unwrap_or_default().join("qr.svg");
             match get_securejoin_qr_svg(&ctx, group).await {
                 Ok(svg) => {
-                    fs::write(&file, svg).await?;
+                    fs::write(&file, svg)?;
                     println!("QR code svg written to: {:#?}", file);
                 }
                 Err(err) => {
@@ -470,7 +448,7 @@ async fn handle_cmd(
         "joinqr" => {
             ctx.start_io().await;
             if !arg0.is_empty() {
-                join_securejoin(&ctx, arg1).await?;
+                dc_join_securejoin(&ctx, arg1).await?;
             }
         }
         "exit" | "quit" => return Ok(ExitResult::Exit),
@@ -480,12 +458,11 @@ async fn handle_cmd(
     Ok(ExitResult::Continue)
 }
 
-#[tokio::main]
-async fn main() -> Result<(), Error> {
+fn main() -> Result<(), Error> {
     let _ = pretty_env_logger::try_init();
 
     let args = std::env::args().collect();
-    start(args).await?;
+    async_std::task::block_on(async move { start(args).await })?;
 
     Ok(())
 }

examples/simple.rs

@@ -6,8 +6,7 @@ use deltachat::config;
 use deltachat::contact::*;
 use deltachat::context::*;
 use deltachat::message::Message;
-use deltachat::stock_str::StockStrings;
-use deltachat::{EventType, Events};
+use deltachat::EventType;
 
 fn cb(event: EventType) {
     match event {
@@ -30,21 +29,21 @@ fn cb(event: EventType) {
 }
 
 /// Run with `RUST_LOG=simple=info cargo run --release --example simple --features repl -- email pw`.
-#[tokio::main]
+#[async_std::main]
 async fn main() {
     pretty_env_logger::try_init_timed().ok();
 
     let dir = tempdir().unwrap();
     let dbfile = dir.path().join("db.sqlite");
     log::info!("creating database {:?}", dbfile);
-    let ctx = Context::new(&dbfile, 0, Events::new(), StockStrings::new())
+    let ctx = Context::new(dbfile.into(), 0)
         .await
         .expect("Failed to create context");
     let info = ctx.get_info().await;
     log::info!("info: {:#?}", info);
 
     let events = ctx.get_event_emitter();
-    let events_spawn = tokio::task::spawn(async move {
+    let events_spawn = async_std::task::spawn(async move {
         while let Some(event) = events.recv().await {
             cb(event.typ);
         }
@@ -81,7 +80,7 @@ async fn main() {
     }
 
     // wait for the message to be sent out
-    tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+    async_std::task::sleep(std::time::Duration::from_secs(1)).await;
 
     log::info!("fetching chats..");
     let chats = Chatlist::try_load(&ctx, 0, None, None).await.unwrap();
@@ -97,5 +96,5 @@ async fn main() {
     ctx.stop_io().await;
     log::info!("closing");
     drop(ctx);
-    events_spawn.await.unwrap();
+    events_spawn.await;
 }

node/.prettierrc.yml

@@ -1,6 +0,0 @@
-# .prettierrc
-trailingComma: es5
-tabWidth: 2
-semi: false
-singleQuote: true
-jsxSingleQuote: true