Use sql migration over direct tables.sql modification

- rename get_encryption_modus() to encryption_modus()

.gitattributes

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

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -25,20 +25,23 @@ jobs:
           override: true
       - run: rustup component add rustfmt
       - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v2
-      - run: cargo fmt --all -- --check
+        uses: swatinem/rust-cache@v1
+      - 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
             components: clippy
             override: true
       - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v2
+        uses: swatinem/rust-cache@v1
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -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:
@@ -60,31 +63,33 @@ jobs:
           components: rust-docs
           override: true
       - name: Cache rust cargo artifacts
-        uses: swatinem/rust-cache@v2
+        uses: swatinem/rust-cache@v1
       - name: Rustdoc
-        run: cargo doc --document-private-items --no-deps
+        uses: actions-rs/cargo@v1
+        with:
+          command: doc
+          args: --document-private-items --no-deps
 
   build_and_test:
     name: Build and test
     strategy:
-      fail-fast: false
       matrix:
         include:
-          # Currently used Rust version.
+          # Currently used Rust version, same as in `rust-toolchain` file.
           - os: ubuntu-latest
-            rust: 1.64.0
+            rust: 1.61.0
             python: 3.9
           - os: windows-latest
-            rust: 1.64.0
+            rust: 1.61.0
             python: false # Python bindings compilation on Windows is not supported.
 
-          # Minimum Supported Rust Version = 1.63.0
+          # Minimum Supported Rust Version = 1.57.0
           #
           # Minimum Supported Python Version = 3.7
           # This is the minimum version for which manylinux Python wheels are
           # built.
           - os: ubuntu-latest
-            rust: 1.63.0
+            rust: 1.57.0
             python: 3.7
     runs-on: ${{ matrix.os }}
     steps:
@@ -97,16 +102,24 @@ jobs:
         override: true
 
     - name: Cache rust cargo artifacts
-      uses: swatinem/rust-cache@v2
+      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
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --all
 
     - name: test cargo vendor
-      run: cargo vendor
+      uses: actions-rs/cargo@v1
+      with:
+        command: vendor
 
     - name: install python
       if: ${{ matrix.python }}
@@ -120,7 +133,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 --features jsonrpc
 
     - name: run python tests
       if: ${{ matrix.python }}
@@ -131,21 +147,6 @@ jobs:
       working-directory: python
       run: tox -e lint,mypy,doc,py3
 
-    - name: build deltachat-rpc-server
-      if: ${{ matrix.python }}
-      run: cargo build -p deltachat-rpc-server
-
-    - name: add deltachat-rpc-server to path
-      if: ${{ matrix.python }}
-      run: echo ${{ github.workspace }}/target/debug >> $GITHUB_PATH
-
-    - name: run deltachat-rpc-client tests
-      if: ${{ matrix.python }}
-      env:
-        DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-      working-directory: deltachat-rpc-client
-      run: tox -e py3,lint
-
     - name: install pypy
       if: ${{ matrix.python }}
       uses: actions/setup-python@v4

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

@@ -15,8 +15,8 @@ jobs:
       - name: install tree
         run: sudo apt install tree
       - name: Checkout
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
         with:
           node-version: '16'
       - name: get tag
@@ -46,12 +46,12 @@ jobs:
         shell: bash
         run: |
           cd deltachat-jsonrpc/typescript
-          npm run build
+          npm run build:tsc
           npm pack .
           ls -lah
           mv $(find deltachat-jsonrpc-client-*) $DELTACHAT_JSONRPC_TAR_GZ
       - name: Upload Prebuild
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v1
         with:
           name: deltachat-jsonrpc-client.tgz
           path: deltachat-jsonrpc/typescript/${{ env.DELTACHAT_JSONRPC_TAR_GZ }}

.github/workflows/jsonrpc.yml

@@ -14,13 +14,18 @@ jobs:
   build_and_test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v1
         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@v2
+        uses: Swatinem/rust-cache@v1.3.0
       - name: npm install
         run: |
           cd deltachat-jsonrpc/typescript

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

@@ -15,7 +15,7 @@ jobs:
       id: getid
       run: |
         export PULLREQUEST_ID=$(jq .number < $GITHUB_EVENT_PATH)
-        echo "prid=$PULLREQUEST_ID" >> $GITHUB_OUTPUT
+        echo ::set-output name=prid::$PULLREQUEST_ID
     - name: Renaming
       run: |
         # create empty file to copy it over the outdated deliverable on download.delta.chat

.github/workflows/node-docs.yml

@@ -9,10 +9,10 @@ jobs:
   generate:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v1
 
     - name: Use Node.js 16.x
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v1
       with:
         node-version: 16.x
 

.github/workflows/node-package.yml

@@ -16,8 +16,8 @@ jobs:
         os: [ubuntu-18.04, macos-latest, windows-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
         with:
           node-version: '16'
       - name: System info
@@ -29,7 +29,7 @@ jobs:
           node --version
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: |
             ${{ env.APPDATA }}/npm-cache
@@ -37,7 +37,7 @@ jobs:
           key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
 
       - name: Cache cargo index
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: |
             ~/.cargo/registry/
@@ -58,7 +58,7 @@ jobs:
           tar -zcvf "${{ matrix.os }}.tar.gz" -C prebuilds .
 
       - name: Upload Prebuild
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v1
         with:
           name: ${{ matrix.os }}
           path: node/${{ matrix.os }}.tar.gz
@@ -71,7 +71,7 @@ jobs:
       - name: install tree
         run: sudo apt install tree
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
@@ -134,7 +134,7 @@ jobs:
           ls -lah
           mv $(find deltachat-node-*) $DELTACHAT_NODE_TAR_GZ
       - name: Upload Prebuild
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v1
         with:
           name: deltachat-node.tgz
           path: ${{ env.DELTACHAT_NODE_TAR_GZ }}

.github/workflows/node-tests.yml

@@ -16,8 +16,8 @@ jobs:
         os: [ubuntu-18.04, macos-latest, windows-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
         with:
           node-version: '16'
       - name: System info
@@ -29,7 +29,7 @@ jobs:
           node --version
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: |
             ${{ env.APPDATA }}/npm-cache
@@ -37,7 +37,7 @@ jobs:
           key: ${{ matrix.os }}-node-${{ hashFiles('**/package.json') }}
 
       - name: Cache cargo index
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: |
             ~/.cargo/registry/
@@ -59,7 +59,6 @@ jobs:
           npm run test
         env:
           DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-          NODE_OPTIONS: '--force-node-api-uncaught-exceptions-policy=true'
       - name: Run tests on Windows, except lint
         timeout-minutes: 10
         if: runner.os == 'Windows'
@@ -68,4 +67,3 @@ jobs:
           npm run test:mocha
         env:
           DCC_NEW_TMP_EMAIL: ${{ secrets.DCC_NEW_TMP_EMAIL }}
-          NODE_OPTIONS: '--force-node-api-uncaught-exceptions-policy=true'

.github/workflows/repl.yml

@@ -11,19 +11,22 @@ 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
       with:
-        toolchain: 1.66.0
+        toolchain: 1.50.0
         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,8 @@ 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: |
         cargo doc --package deltachat --no-deps

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

@@ -12,7 +12,8 @@ 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: |
         cargo doc --package deltachat_ffi --no-deps

.gitignore

@@ -12,8 +12,8 @@ include
 *.db
 *.db-blobs
 
-.tox
 python/.eggs
+python/.tox
 *.egg-info
 __pycache__
 python/src/deltachat/capi*.so

CHANGELOG.md

@@ -3,136 +3,12 @@
 ## Unreleased
 
 ### Changes
-- Pipeline SMTP commands #3924
-- Cache DNS results #3970
-
-### Fixes
-- Securejoin: Fix adding and handling Autocrypt-Gossip headers #3914
-- fix verifier-by addr was empty string intead of None #3961
-- Emit DC_EVENT_MSGS_CHANGED for DC_CHAT_ID_ARCHIVED_LINK when the number of archived chats with
-  unread messages increases #3959
-- Fix Peerstate comparison #3962
-- Log SOCKS5 configuration for IMAP like already done for SMTP #3964
-- Fix SOCKS5 usage for IMAP #3965
-- Exit from recently seen loop on interrupt channel errors to avoid busy looping #3966
-
-### API-Changes
-- jsonrpc: add verified-by information to `Contact`-Object
-- Remove `attach_selfavatar` config #3951
-
-
-## 1.106.0
-
-### Changes
-- Only send IncomingMsgBunch if there are more than 0 new messages #3941
-
-### Fixes
-- fix: only send contact changed event for recently seen if it is relevant (not too old to matter) #3938
-- Immediately save `accounts.toml` if it was modified by a migration from absolute paths to relative paths #3943
-- Do not treat invalid email addresses as an exception #3942
-- Add timeouts to HTTP requests #3948
-
-
-## 1.105.0
-
-### Changes
-- Validate signatures in try_decrypt() even if the message isn't encrypted #3859
-- Don't parse the message again after detached signatures validation #3862
-- Move format=flowed support to a separate crate #3869
-- cargo: bump quick-xml from 0.23.0 to 0.26.0 #3722
-- Add fuzzing tests #3853
-- Add mappings for some file types to Viewtype / MIME type #3881
-- Buffer IMAP client writes #3888
-- move `DC_CHAT_ID_ARCHIVED_LINK` to the top of chat lists
-  and make `dc_get_fresh_msg_cnt()` work for `DC_CHAT_ID_ARCHIVED_LINK` #3918
-- make `dc_marknoticed_chat()` work for `DC_CHAT_ID_ARCHIVED_LINK` #3919
-- Update provider database
-
-### API-Changes
-- jsonrpc: add python API for webxdc updates #3872
-- jsonrpc: add fresh message count to ChatListItemFetchResult::ArchiveLink
-- Add ffi functions to retrieve `verified by` information #3786
-- resultify `Message::get_filebytes()` #3925
-
-### Fixes
-- Do not add an error if the message is encrypted but not signed #3860
-- Do not strip leading spaces from message lines #3867
-- Don't always rebuild group member lists #3872
-- Fix uncaught exception in JSON-RPC tests #3884
-- Fix STARTTLS connection and add a test for it #3907
-- Trigger reconnection when failing to fetch existing messages #3911
-- Do not retry fetching existing messages after failure, prevents infinite reconnection loop #3913
-- Ensure format=flowed formatting is always reversible on the receiver side #3880
-
-## 1.104.0
-
-### Changes
-- Don't use deprecated `chrono` functions #3798
-- Document accounts manager #3837
-- If a classical-email-user sends an email to a group and adds new recipients,
-  add the new recipients as group members #3781
-- Remove `pytest-async` plugin #3846
-- Only send the message about ephemeral timer change if the chat is promoted #3847
-- Use relative paths in `accounts.toml` #3838
-
-### Fixes
-- Set read/write timeouts for IMAP over SOCKS5 #3833
-- Treat attached PGP keys as peer keys with mutual encryption preference #3832
-- fix migration of old databases #3842
-- Fix cargo clippy and doc errors after Rust update to 1.66 #3850
-- Don't send GroupNameChanged message if the group name doesn't change in terms of
-  `improve_single_line_input()` #3852
-- Prefer encryption for the peer if the message is encrypted or signed with the known key #3849
-
-
-## 1.103.0
-
-### Changes
-- Disable Autocrypt & Authres-checking for mailing lists,
-  because they don't work well with mailing lists #3765
-- Refactor: Remove the remaining AsRef<str> #3669
-- Add more logging to `fetch_many_msgs` and refactor it #3811
-- Small speedup #3780
-- Log the reason when the message cannot be sent to the chat #3810
-- Add IMAP server ID line to the context info only when it is known #3814
-- Remove autogenerated typescript files #3815
-- Move functions that require an IMAP session from `Imap` to `Session`
-  to reduce the number of code paths where IMAP session may not exist.
-  Drop connection on error instead of trying to disconnect,
-  potentially preventing IMAP task from getting stuck. #3812
-
-### API-Changes
-- Add Python API to send reactions #3762
-- jsonrpc: add message errors to MessageObject #3788
-- jsonrpc: Add async Python client #3734
-
-### Fixes
-- Make sure malformed messsages will never block receiving further messages anymore #3771
-- strip leading/trailing whitespace from "Chat-Group-Name{,-Changed}:" headers content #3650
-- Assume all Thunderbird users prefer encryption #3774
-- refactor peerstate handling to ensure no duplicate peerstates #3776
-- Fetch messages in order of their INTERNALDATE (fixes reactions for Gmail f.e.) #3789
-- python: do not pass NULL to ffi.gc if the context can't be created #3818
-- Add read/write timeouts to IMAP sockets #3820
-- Add connection timeout to IMAP sockets #3828
-- Disable read timeout during IMAP IDLE #3826
-- Bots automatically accept mailing lists #3831
-
-
-## 1.102.0
-
-### Changes
-
-- If an email has multiple From addresses, handle this as if there was
-  no From address, to prevent from forgery attacks. Also, improve
-  handling of emails with invalid From addresses in general #3667
 
 ### API-Changes
 
 ### Fixes
 - fix detection of "All mail", "Trash", "Junk" etc folders. #3760
 - fetch messages sequentially to fix reactions on partially downloaded messages #3688
-- Fix a bug where one malformed message blocked receiving any further messages #3769
 
 
 ## 1.101.0

Cargo.toml

@@ -1,9 +1,10 @@
 [package]
 name = "deltachat"
-version = "1.106.0"
+version = "1.101.0"
+authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.63"
+rust-version = "1.57"
 
 [profile.dev]
 debug = 0
@@ -19,18 +20,17 @@ panic = 'abort'
 
 [dependencies]
 deltachat_derive = { path = "./deltachat_derive" }
-format-flowed = { path = "./format-flowed" }
 
 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.6", default-features = false, features = ["smtp-transport", "socks5", "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
 backtrace = "0.3"
-base64 = "0.20"
+base64 = "0.13"
 bitflags = "1.3"
 chrono = { version = "0.4", default-features=false, features = ["clock", "std"] }
 dirs = { version = "4", optional=true }
@@ -39,25 +39,25 @@ encoded-words = { git = "https://github.com/async-email/encoded-words", branch =
 escaper = "0.1"
 futures = "0.3"
 hex = "0.4.0"
-image = { version = "0.24.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
+image = { version = "0.24.4", 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.14"
+mailparse = "0.13"
 native-tls = "0.2"
-num_cpus = "1.15"
+num_cpus = "1.13"
 num-derive = "0.3"
 num-traits = "0.2"
-once_cell = "1.17.0"
+once_cell = "1.16.0"
 percent-encoding = "2.2"
 pgp = { version = "0.9", default-features = false }
 pretty_env_logger = { version = "0.4", optional = true }
-quick-xml = "0.27"
+quick-xml = "0.23"
 r2d2 = "0.8"
 r2d2_sqlite = "0.20"
 rand = "0.8"
-regex = "1.7"
+regex = "1.6"
 rusqlite = { version = "0.27", features = ["sqlcipher"] }
 rust-hsluv = "0.1"
 rustyline = { version = "10", optional = true }
@@ -74,20 +74,19 @@ toml = "0.5"
 url = "2"
 uuid = { version = "1", features = ["serde", "v4"] }
 fast-socks5 = "0.8"
-humansize = "2"
+humansize = "1"
 qrcodegen = "1.7.0"
-tagger = "4.3.4"
+tagger = "4.3.3"
 textwrap = "0.16.0"
-async-channel = "1.8.0"
+async-channel = "1.6.1"
 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"] }
+reqwest = { version = "0.11.12", features = ["json"] }
 async_zip = { version = "0.0.9", default-features = false, features = ["deflate"] }
 
 [dev-dependencies]
 ansi_term = "0.12.0"
-criterion = { version = "0.4.0", features = ["async_tokio"] }
+criterion = { version = "0.3.6", features = ["async_tokio"] }
 futures-lite = "1.12"
 log = "0.4"
 pretty_env_logger = "0.4"
@@ -100,8 +99,7 @@ members = [
   "deltachat-ffi",
   "deltachat_derive",
   "deltachat-jsonrpc",
-  "deltachat-rpc-server",
-  "format-flowed",
+  "deltachat-rpc-server"
 ]
 
 [[example]]

README.md

@@ -115,43 +115,11 @@ use the `--ignored` argument to the test binary (not to cargo itself):
 $ cargo test -- --ignored
 ```
 
-### Fuzzing
-
-Install [`cargo-bolero`](https://github.com/camshaft/bolero) with
-```sh
-$ cargo install cargo-bolero
-```
-
-Run fuzzing tests with
-```sh
-$ cd fuzz
-$ cargo bolero test fuzz_mailparse --release=false -s NONE
-```
-
-Corpus is created at `fuzz/fuzz_targets/corpus`,
-you can add initial inputs there.
-For `fuzz_mailparse` target corpus can be populated with
-`../test-data/message/*.eml`.
-
-To run with AFL instead of libFuzzer:
-```sh
-$ cargo bolero test fuzz_format_flowed --release=false -e afl -s NONE
-```
-
 ## Features
 
 - `vendored`: When using Openssl for TLS, this bundles a vendored version.
 - `nightly`: Enable nightly only performance and security related features.
 
-## Update Provider Data
-
-To add the updates from the
-[provider-db](https://github.com/deltachat/provider-db) to the core, run:
-
-```
-./src/provider/update.py ../provider-db/_providers/ > src/provider/data.rs
-```
-
 ## Language bindings and frontend projects
 
 Language bindings are available for:

assets/icon-archive.svg

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

benches/create_account.rs

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

benches/get_chat_msgs.rs

@@ -1,6 +1,7 @@
 use std::path::Path;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
+
 use deltachat::chat::{self, ChatId};
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;

benches/get_chatlist.rs

@@ -1,6 +1,7 @@
 use std::path::Path;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
+
 use deltachat::chatlist::Chatlist;
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;

benches/receive_emails.rs

@@ -38,64 +38,11 @@ Hello {i}",
     context
 }
 
-/// Receive 100 emails that remove charlie@example.com and add
-/// him back
-async fn recv_groupmembership_emails(context: Context) -> Context {
-    for i in 0..50 {
-        let imf_raw = format!(
-            "Subject: Benchmark
-Message-ID: Gr.OssSYnOFkhR.{i}@testrun.org
-Date: Sat, 07 Dec 2019 19:00:27 +0000
-To: alice@example.com, b@example.com, c@example.com, d@example.com, e@example.com, f@example.com
-From: sender@testrun.org
-Chat-Version: 1.0
-Chat-Disposition-Notification-To: sender@testrun.org
-Chat-User-Avatar: 0
-Chat-Group-Member-Added: charlie@example.com
-In-Reply-To: Gr.OssSYnOFkhR.{i_dec}@testrun.org
-MIME-Version: 1.0
-
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-
-Hello {i}",
-            i = i,
-            i_dec = i - 1,
-        );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
-            .await
-            .unwrap();
-
-        let imf_raw = format!(
-            "Subject: Benchmark
-Message-ID: Gr.OssSYnOFkhR.{i}@testrun.org
-Date: Sat, 07 Dec 2019 19:00:27 +0000
-To: alice@example.com, b@example.com, c@example.com, d@example.com, e@example.com, f@example.com
-From: sender@testrun.org
-Chat-Version: 1.0
-Chat-Disposition-Notification-To: sender@testrun.org
-Chat-User-Avatar: 0
-Chat-Group-Member-Removed: charlie@example.com
-In-Reply-To: Gr.OssSYnOFkhR.{i_dec}@testrun.org
-MIME-Version: 1.0
-
-Content-Type: text/plain; charset=utf-8; format=flowed; delsp=no
-
-Hello {i}",
-            i = i,
-            i_dec = i - 1,
-        );
-        receive_imf(&context, black_box(imf_raw.as_bytes()), false)
-            .await
-            .unwrap();
-    }
-    context
-}
-
 async fn create_context() -> Context {
     let dir = tempdir().unwrap();
     let dbfile = dir.path().join("db.sqlite");
     let id = 100;
-    let context = Context::new(dbfile.as_path(), id, Events::new(), StockStrings::new())
+    let context = Context::new(&dbfile, id, Events::new(), StockStrings::new())
         .await
         .unwrap();
 
@@ -105,7 +52,7 @@ async fn create_context() -> Context {
 
     if backup.exists() {
         println!("Importing backup");
-        imex(&context, ImexMode::ImportBackup, backup.as_path(), None)
+        imex(&context, ImexMode::ImportBackup, &backup, None)
             .await
             .unwrap();
     }
@@ -136,20 +83,6 @@ fn criterion_benchmark(c: &mut Criterion) {
             }
         });
     });
-    group.bench_function(
-        "Receive 100 Chat-Group-Member-{Added|Removed} messages",
-        |b| {
-            let rt = tokio::runtime::Runtime::new().unwrap();
-            let context = rt.block_on(create_context());
-
-            b.to_async(&rt).iter(|| {
-                let ctx = context.clone();
-                async move {
-                    recv_groupmembership_emails(black_box(ctx)).await;
-                }
-            });
-        },
-    );
     group.finish();
 }
 

benches/search_msgs.rs

@@ -1,9 +1,8 @@
-use std::path::Path;
-
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use deltachat::context::Context;
 use deltachat::stock_str::StockStrings;
 use deltachat::Events;
+use std::path::Path;
 
 async fn search_benchmark(dbfile: impl AsRef<Path>) {
     let id = 100;

deltachat-ffi/Cargo.toml

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

deltachat-ffi/deltachat.h

@@ -1227,11 +1227,7 @@ int             dc_get_msg_cnt               (dc_context_t* context, uint32_t ch
  * Get the number of _fresh_ messages in a chat.
  * Typically used to implement a badge with a number in the chatlist.
  *
- * As muted archived chats are not unarchived automatically,
- * a similar information is needed for the @ref dc_get_chatlist() "archive link" as well:
- * here, the number of archived chats containing fresh messages is returned.
- *
- * If the specified chat is muted or the @ref dc_get_chatlist() "archive link",
+ * If the specified chat is muted,
  * the UI should show the badge counter "less obtrusive",
  * e.g. using "gray" instead of "red" color.
  *
@@ -4739,37 +4735,6 @@ int             dc_contact_is_blocked        (const dc_contact_t* contact);
 int             dc_contact_is_verified       (dc_contact_t* contact);
 
 
-
-/**
- * Return the address that verified a contact
- *
- * The UI may use this in addition to a checkmark showing the verification status
- *
- * @memberof dc_contact_t
- * @param contact The contact object.
- * @return 
- *    A string containing the verifiers address. If it is the same address as the contact itself,
- *    we verified the contact ourself. If it is an empty string, we don't have verifier 
- *    information or the contact is not verified.
- */
-char*           dc_contact_get_verifier_addr       (dc_contact_t* contact);
-
-
-/**
- * Return the `ContactId` that verified a contact
- *
- * The UI may use this in addition to a checkmark showing the verification status
- *
- * @memberof dc_contact_t
- * @param contact The contact object.
- * @return 
- *    The `ContactId` of the verifiers address. If it is the same address as the contact itself,
- *    we verified the contact ourself. If it is 0, we don't have verifier information or 
- *    the contact is not verified.
- */
-uint32_t       dc_contact_get_verifier_id      (dc_contact_t* contact);
-
-
 /**
  * @class dc_provider_t
  *
@@ -5811,7 +5776,7 @@ void dc_event_unref(dc_event_t* event);
  * @param data2 (int) The progress as:
  *     300=vg-/vc-request received, typically shown as "bob@addr joins".
  *     600=vg-/vc-request-with-auth received, vg-member-added/vc-contact-confirm sent, typically shown as "bob@addr verified".
- *     800=contact added to chat, shown as "bob@addr securely joined GROUP". Only for the verified-group-protocol.
+ *     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.
  */
 #define DC_EVENT_SECUREJOIN_INVITER_PROGRESS      2060

deltachat-ffi/src/lib.rs

@@ -23,6 +23,13 @@ use std::sync::Arc;
 use std::time::{Duration, SystemTime};
 
 use anyhow::Context as _;
+use deltachat::qr_code_generator::get_securejoin_qr_svg;
+use num_traits::{FromPrimitive, ToPrimitive};
+use once_cell::sync::Lazy;
+use rand::Rng;
+use tokio::runtime::Runtime;
+use tokio::sync::RwLock;
+
 use deltachat::chat::{ChatId, ChatVisibility, MuteDuration, ProtectionStatus};
 use deltachat::constants::DC_MSG_ID_LAST_SPECIAL;
 use deltachat::contact::{Contact, ContactId, Origin};
@@ -30,27 +37,20 @@ use deltachat::context::Context;
 use deltachat::ephemeral::Timer as EphemeralTimer;
 use deltachat::key::DcKey;
 use deltachat::message::MsgId;
-use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use deltachat::reaction::{get_msg_reactions, send_reaction, Reactions};
 use deltachat::stock_str::StockMessage;
 use deltachat::stock_str::StockStrings;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::*;
 use deltachat::{accounts::Accounts, log::LogExt};
-use num_traits::{FromPrimitive, ToPrimitive};
-use once_cell::sync::Lazy;
-use rand::Rng;
-use tokio::runtime::Runtime;
-use tokio::sync::RwLock;
 use tokio::task::JoinHandle;
 
 mod dc_array;
 mod lot;
 
 mod string;
-use deltachat::chatlist::Chatlist;
-
 use self::string::*;
+use deltachat::chatlist::Chatlist;
 
 // as C lacks a good and portable error handling,
 // in general, the C Interface is forgiving wrt to bad parameters.
@@ -1659,7 +1659,7 @@ pub unsafe extern "C" fn dc_set_chat_profile_image(
     let ctx = &*context;
 
     block_on(async move {
-        chat::set_chat_profile_image(ctx, ChatId::new(chat_id), &to_string_lossy(image))
+        chat::set_chat_profile_image(ctx, ChatId::new(chat_id), to_string_lossy(image))
             .await
             .map(|_| 1)
             .unwrap_or_log_default(ctx, "Failed to set profile image")
@@ -2182,7 +2182,7 @@ pub unsafe extern "C" fn dc_imex(
         eprintln!("ignoring careless call to dc_imex()");
         return;
     }
-    let what = match imex::ImexMode::from_i32(what_raw) {
+    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 +2253,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;
     }
@@ -2444,9 +2447,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)))
     })
 }
@@ -2693,7 +2702,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 +2722,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 +2753,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();
@@ -3309,8 +3318,6 @@ pub unsafe extern "C" fn dc_msg_get_filebytes(msg: *mut dc_msg_t) -> u64 {
     let ctx = &*ffi_msg.context;
 
     block_on(ffi_msg.message.get_filebytes(ctx))
-        .unwrap_or_log_default(ctx, "Cannot get file size")
-        .unwrap_or_default()
 }
 
 #[no_mangle]
@@ -3965,37 +3972,6 @@ pub unsafe extern "C" fn dc_contact_is_verified(contact: *mut dc_contact_t) -> l
         .unwrap_or_default() as libc::c_int
 }
 
-#[no_mangle]
-pub unsafe extern "C" fn dc_contact_get_verifier_addr(
-    contact: *mut dc_contact_t,
-) -> *mut libc::c_char {
-    if contact.is_null() {
-        eprintln!("ignoring careless call to dc_contact_get_verifier_addr()");
-        return "".strdup();
-    }
-    let ffi_contact = &*contact;
-    let ctx = &*ffi_contact.context;
-    block_on(ffi_contact.contact.get_verifier_addr(ctx))
-        .log_err(ctx, "failed to get verifier for contact")
-        .unwrap_or_default()
-        .strdup()
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn dc_contact_get_verifier_id(contact: *mut dc_contact_t) -> u32 {
-    if contact.is_null() {
-        eprintln!("ignoring careless call to dc_contact_get_verifier_id()");
-        return 0;
-    }
-    let ffi_contact = &*contact;
-    let ctx = &*ffi_contact.context;
-    let verifier_contact_id = block_on(ffi_contact.contact.get_verifier_id(ctx))
-        .log_err(ctx, "failed to get verifier")
-        .unwrap_or_default()
-        .unwrap_or_default();
-
-    verifier_contact_id.to_u32()
-}
 // dc_lot_t
 
 pub type dc_lot_t = lot::Lot;
@@ -4577,12 +4553,11 @@ pub unsafe extern "C" fn dc_accounts_get_event_emitter(
 
 #[cfg(feature = "jsonrpc")]
 mod jsonrpc {
+    use super::*;
     use deltachat_jsonrpc::api::CommandApi;
     use deltachat_jsonrpc::events::event_to_json_rpc_notification;
     use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};
 
-    use super::*;
-
     pub struct dc_jsonrpc_instance_t {
         receiver: OutReceiver,
         handle: RpcSession<CommandApi>,

deltachat-ffi/src/lot.rs

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

deltachat-ffi/src/string.rs

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

deltachat-jsonrpc/Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "deltachat-jsonrpc"
-version = "1.106.0"
+version = "1.101.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"
@@ -18,21 +19,21 @@ num-traits = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 tempfile = "3.3.0"
 log = "0.4"
-async-channel = { version = "1.8.0" }
+async-channel = { version = "1.6.1" }
 futures = { version = "0.3.25" }
-serde_json = "1.0.91"
+serde_json = "1.0.87"
 yerpc = { version = "^0.3.1", features = ["anyhow_expose"] }
-typescript-type-def = { version = "0.5.5", features = ["json_value"] }
-tokio = { version = "1.23.1" }
+typescript-type-def = { version = "0.5.3", features = ["json_value"] }
+tokio = { version = "1.21.2" }
 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 }
+axum = { version = "0.5.17", optional = true, features = ["ws"] }
+env_logger = { version = "0.9.1", optional = true }
 
 [dev-dependencies]
-tokio = { version = "1.23.1", features = ["full", "rt-multi-thread"] }
+tokio = { version = "1.21.2", features = ["full", "rt-multi-thread"] }
 
 
 [features]

deltachat-jsonrpc/src/api/mod.rs

@@ -1,9 +1,4 @@
-use std::collections::BTreeMap;
-use std::sync::Arc;
-use std::{collections::HashMap, str::FromStr};
-
 use anyhow::{anyhow, bail, ensure, Context, Result};
-pub use deltachat::accounts::Accounts;
 use deltachat::{
     chat::{
         self, add_contact_to_chat, forward_msgs, get_chat_media, get_chat_msgs, marknoticed_chat,
@@ -28,14 +23,21 @@ use deltachat::{
     webxdc::StatusUpdateSerial,
 };
 use sanitize_filename::is_sanitized;
+use std::collections::BTreeMap;
+use std::sync::Arc;
+use std::{collections::HashMap, str::FromStr};
 use tokio::{fs, sync::RwLock};
 use walkdir::WalkDir;
 use yerpc::rpc;
 
+pub use deltachat::accounts::Accounts;
+
 pub mod events;
 pub mod types;
 
-use num_traits::FromPrimitive;
+use crate::api::types::chat_list::{get_chat_list_item_by_id, ChatListItemFetchResult};
+use crate::api::types::qr::QrObject;
+
 use types::account::Account;
 use types::chat::FullChat;
 use types::chat_list::ChatListEntry;
@@ -45,14 +47,14 @@ use types::provider_info::ProviderInfo;
 use types::webxdc::WebxdcMessageInfo;
 
 use self::types::{
-    chat::{BasicChat, JSONRPCChatVisibility, MuteDuration},
+    chat::{BasicChat, JSONRPCChatVisibility, JSONRPCEncryptionModus, MuteDuration},
     location::JsonrpcLocation,
     message::{
         JSONRPCMessageListItem, MessageNotificationInfo, MessageSearchResult, MessageViewtype,
     },
 };
-use crate::api::types::chat_list::{get_chat_list_item_by_id, ChatListItemFetchResult};
-use crate::api::types::qr::QrObject;
+
+use num_traits::FromPrimitive;
 
 #[derive(Clone, Debug)]
 pub struct CommandApi {
@@ -526,6 +528,8 @@ impl CommandApi {
         ChatId::new(chat_id).get_encryption_info(&ctx).await
     }
 
+
+
     /// Get QR code (text and SVG) that will offer an Setup-Contact or Verified-Group invitation.
     /// The QR code is compatible to the OPENPGP4FPR format
     /// so that a basic fingerprint comparison also works e.g. with OpenKeychain.
@@ -555,6 +559,32 @@ impl CommandApi {
         ))
     }
 
+    async fn set_chat_encryption_modus(
+        &self,
+        account_id: u32,
+        chat_id: u32,
+        encryption_modus: JSONRPCEncryptionModus
+    ) -> Result<()> {
+        let ctx = self.get_context(account_id).await?;
+        let chat = ChatId::new(chat_id);
+        Ok(chat.set_encryption_modus(&ctx, encryption_modus.into_core_type()).await?)
+    }
+
+    async fn get_chat_encryption_modus(
+        &self,
+        account_id: u32,
+        chat_id: u32
+    ) -> Result<Option<JSONRPCEncryptionModus>> {
+        let ctx = self.get_context(account_id).await?;
+        let chat = ChatId::new(chat_id);
+        Ok(
+            match chat.encryption_modus(&ctx).await? {
+                Some(encryption_modus) => Some(JSONRPCEncryptionModus::from_core_type(encryption_modus)),
+                None => None,
+            }
+        )
+    }
+
     /// Continue a Setup-Contact or Verified-Group-Invite protocol
     /// started on another device with `get_chat_securejoin_qr_code_svg()`.
     /// This function is typically called when `check_qr()` returns
@@ -731,7 +761,7 @@ impl CommandApi {
         image_path: Option<String>,
     ) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
-        chat::set_chat_profile_image(&ctx, ChatId::new(chat_id), &image_path.unwrap_or_default())
+        chat::set_chat_profile_image(&ctx, ChatId::new(chat_id), image_path.unwrap_or_default())
             .await
     }
 

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

@@ -2,7 +2,7 @@ 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::chat::{Chat, ChatId, EncryptionModus};
 use deltachat::constants::Chattype;
 use deltachat::contact::{Contact, ContactId};
 use deltachat::context::Context;
@@ -211,3 +211,33 @@ impl JSONRPCChatVisibility {
         }
     }
 }
+
+
+#[derive(Clone, Serialize, Deserialize, TypeDef)]
+#[serde(rename = "EncryptionModus")]
+pub enum JSONRPCEncryptionModus {
+    Opportunistic = 0,
+    ForcePlaintext = 1,
+    ForceEncrypted = 2,
+    ForceVerified = 3,
+}
+
+impl JSONRPCEncryptionModus {
+    pub fn into_core_type(self) -> EncryptionModus {
+        match self {
+            JSONRPCEncryptionModus::Opportunistic => EncryptionModus::Opportunistic,
+            JSONRPCEncryptionModus::ForcePlaintext => EncryptionModus::ForcePlaintext,
+            JSONRPCEncryptionModus::ForceEncrypted => EncryptionModus::ForceEncrypted,
+            JSONRPCEncryptionModus::ForceVerified => EncryptionModus::ForceVerified
+        }
+    }
+
+    pub fn from_core_type(core_encryption_modus: EncryptionModus) -> Self {
+        match core_encryption_modus {
+            EncryptionModus::Opportunistic => JSONRPCEncryptionModus::Opportunistic,
+            EncryptionModus::ForcePlaintext => JSONRPCEncryptionModus::ForcePlaintext,
+            EncryptionModus::ForceEncrypted => JSONRPCEncryptionModus::ForceEncrypted,
+            EncryptionModus::ForceVerified => JSONRPCEncryptionModus::ForceVerified
+        }
+    }
+}

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

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

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

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

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

@@ -34,9 +34,6 @@ pub struct MessageObject {
     view_type: MessageViewtype,
     state: u32,
 
-    /// An error text, if there is one.
-    error: Option<String>,
-
     timestamp: i64,
     sort_timestamp: i64,
     received_timestamp: i64,
@@ -105,7 +102,7 @@ impl MessageObject {
 
         let sender_contact = Contact::load_from_db(context, message.get_from_id()).await?;
         let sender = ContactObject::try_from_dc_contact(context, sender_contact).await?;
-        let file_bytes = message.get_filebytes(context).await?.unwrap_or_default();
+        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 {
@@ -170,7 +167,6 @@ impl MessageObject {
                 .get_state()
                 .to_u32()
                 .ok_or_else(|| anyhow!("state conversion to number failed"))?,
-            error: message.error(),
 
             timestamp: message.get_timestamp(),
             sort_timestamp: message.get_sort_timestamp(),

deltachat-jsonrpc/src/lib.rs

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

deltachat-jsonrpc/src/webserver.rs

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

deltachat-jsonrpc/typescript/.gitignore

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

deltachat-jsonrpc/typescript/generated/client.ts

@@ -0,0 +1,958 @@
+// AUTO-GENERATED by yerpc-derive
+
+import * as T from "./types.js"
+import * as RPC from "./jsonrpc.js"
+
+type RequestMethod = (method: string, params?: RPC.Params) => Promise<unknown>;
+type NotificationMethod = (method: string, params?: RPC.Params) => void;
+
+interface Transport {
+  request: RequestMethod,
+  notification: NotificationMethod
+}
+
+export class RawClient {
+  constructor(private _transport: Transport) {}
+
+  /**
+   * Check if an email address is valid.
+   */
+  public checkEmailValidity(email: string): Promise<boolean> {
+    return (this._transport.request('check_email_validity', [email] as RPC.Params)) as Promise<boolean>;
+  }
+
+  /**
+   * Get general system info.
+   */
+  public getSystemInfo(): Promise<Record<string,string>> {
+    return (this._transport.request('get_system_info', [] as RPC.Params)) as Promise<Record<string,string>>;
+  }
+
+
+  public addAccount(): Promise<T.U32> {
+    return (this._transport.request('add_account', [] as RPC.Params)) as Promise<T.U32>;
+  }
+
+
+  public removeAccount(accountId: T.U32): Promise<null> {
+    return (this._transport.request('remove_account', [accountId] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public getAllAccountIds(): Promise<(T.U32)[]> {
+    return (this._transport.request('get_all_account_ids', [] as RPC.Params)) as Promise<(T.U32)[]>;
+  }
+
+  /**
+   * Select account id for internally selected state.
+   * TODO: Likely this is deprecated as all methods take an account id now.
+   */
+  public selectAccount(id: T.U32): Promise<null> {
+    return (this._transport.request('select_account', [id] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Get the selected account id of the internal state..
+   * TODO: Likely this is deprecated as all methods take an account id now.
+   */
+  public getSelectedAccountId(): Promise<(T.U32|null)> {
+    return (this._transport.request('get_selected_account_id', [] as RPC.Params)) as Promise<(T.U32|null)>;
+  }
+
+  /**
+   * Get a list of all configured accounts.
+   */
+  public getAllAccounts(): Promise<(T.Account)[]> {
+    return (this._transport.request('get_all_accounts', [] as RPC.Params)) as Promise<(T.Account)[]>;
+  }
+
+
+  public startIoForAllAccounts(): Promise<null> {
+    return (this._transport.request('start_io_for_all_accounts', [] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public stopIoForAllAccounts(): Promise<null> {
+    return (this._transport.request('stop_io_for_all_accounts', [] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public startIo(id: T.U32): Promise<null> {
+    return (this._transport.request('start_io', [id] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public stopIo(id: T.U32): Promise<null> {
+    return (this._transport.request('stop_io', [id] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Get top-level info for an account.
+   */
+  public getAccountInfo(accountId: T.U32): Promise<T.Account> {
+    return (this._transport.request('get_account_info', [accountId] as RPC.Params)) as Promise<T.Account>;
+  }
+
+  /**
+   * Get the combined filesize of an account in bytes
+   */
+  public getAccountFileSize(accountId: T.U32): Promise<T.U64> {
+    return (this._transport.request('get_account_file_size', [accountId] as RPC.Params)) as Promise<T.U64>;
+  }
+
+  /**
+   * Returns provider for the given domain.
+   *
+   * This function looks up domain in offline database.
+   *
+   * For compatibility, email address can be passed to this function
+   * instead of the domain.
+   */
+  public getProviderInfo(accountId: T.U32, email: string): Promise<(T.ProviderInfo|null)> {
+    return (this._transport.request('get_provider_info', [accountId, email] as RPC.Params)) as Promise<(T.ProviderInfo|null)>;
+  }
+
+  /**
+   * Checks if the context is already configured.
+   */
+  public isConfigured(accountId: T.U32): Promise<boolean> {
+    return (this._transport.request('is_configured', [accountId] as RPC.Params)) as Promise<boolean>;
+  }
+
+  /**
+   * Get system info for an account.
+   */
+  public getInfo(accountId: T.U32): Promise<Record<string,string>> {
+    return (this._transport.request('get_info', [accountId] as RPC.Params)) as Promise<Record<string,string>>;
+  }
+
+
+  public setConfig(accountId: T.U32, key: string, value: (string|null)): Promise<null> {
+    return (this._transport.request('set_config', [accountId, key, value] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public batchSetConfig(accountId: T.U32, config: Record<string,(string|null)>): Promise<null> {
+    return (this._transport.request('batch_set_config', [accountId, config] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Set configuration values from a QR code. (technically from the URI that is stored in the qrcode)
+   * Before this function is called, `checkQr()` should confirm the type of the
+   * QR code is `account` or `webrtcInstance`.
+   *
+   * Internally, the function will call dc_set_config() with the appropriate keys,
+   */
+  public setConfigFromQr(accountId: T.U32, qrContent: string): Promise<null> {
+    return (this._transport.request('set_config_from_qr', [accountId, qrContent] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public checkQr(accountId: T.U32, qrContent: string): Promise<T.Qr> {
+    return (this._transport.request('check_qr', [accountId, qrContent] as RPC.Params)) as Promise<T.Qr>;
+  }
+
+
+  public getConfig(accountId: T.U32, key: string): Promise<(string|null)> {
+    return (this._transport.request('get_config', [accountId, key] as RPC.Params)) as Promise<(string|null)>;
+  }
+
+
+  public batchGetConfig(accountId: T.U32, keys: (string)[]): Promise<Record<string,(string|null)>> {
+    return (this._transport.request('batch_get_config', [accountId, keys] as RPC.Params)) as Promise<Record<string,(string|null)>>;
+  }
+
+
+  public setStockStrings(strings: Record<T.U32,string>): Promise<null> {
+    return (this._transport.request('set_stock_strings', [strings] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Configures this account with the currently set parameters.
+   * Setup the credential config before calling this.
+   */
+  public configure(accountId: T.U32): Promise<null> {
+    return (this._transport.request('configure', [accountId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Signal an ongoing process to stop.
+   */
+  public stopOngoingProcess(accountId: T.U32): Promise<null> {
+    return (this._transport.request('stop_ongoing_process', [accountId] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public exportSelfKeys(accountId: T.U32, path: string, passphrase: (string|null)): Promise<null> {
+    return (this._transport.request('export_self_keys', [accountId, path, passphrase] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public importSelfKeys(accountId: T.U32, path: string, passphrase: (string|null)): Promise<null> {
+    return (this._transport.request('import_self_keys', [accountId, path, passphrase] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Returns the message IDs of all _fresh_ messages of any chat.
+   * Typically used for implementing notification summaries
+   * or badge counters e.g. on the app icon.
+   * The list is already sorted and starts with the most recent fresh message.
+   *
+   * Messages belonging to muted chats or to the contact requests are not returned;
+   * these messages should not be notified
+   * and also badge counters should not include these messages.
+   *
+   * To get the number of fresh messages for a single chat, muted or not,
+   * use `get_fresh_msg_cnt()`.
+   */
+  public getFreshMsgs(accountId: T.U32): Promise<(T.U32)[]> {
+    return (this._transport.request('get_fresh_msgs', [accountId] as RPC.Params)) as Promise<(T.U32)[]>;
+  }
+
+  /**
+   * Get the number of _fresh_ messages in a chat.
+   * Typically used to implement a badge with a number in the chatlist.
+   *
+   * If the specified chat is muted,
+   * the UI should show the badge counter "less obtrusive",
+   * e.g. using "gray" instead of "red" color.
+   */
+  public getFreshMsgCnt(accountId: T.U32, chatId: T.U32): Promise<T.Usize> {
+    return (this._transport.request('get_fresh_msg_cnt', [accountId, chatId] as RPC.Params)) as Promise<T.Usize>;
+  }
+
+  /**
+   * Estimate the number of messages that will be deleted
+   * by the set_config()-options `delete_device_after` or `delete_server_after`.
+   * This is typically used to show the estimated impact to the user
+   * before actually enabling deletion of old messages.
+   */
+  public estimateAutoDeletionCount(accountId: T.U32, fromServer: boolean, seconds: T.I64): Promise<T.Usize> {
+    return (this._transport.request('estimate_auto_deletion_count', [accountId, fromServer, seconds] as RPC.Params)) as Promise<T.Usize>;
+  }
+
+
+  public initiateAutocryptKeyTransfer(accountId: T.U32): Promise<string> {
+    return (this._transport.request('initiate_autocrypt_key_transfer', [accountId] as RPC.Params)) as Promise<string>;
+  }
+
+
+  public continueAutocryptKeyTransfer(accountId: T.U32, messageId: T.U32, setupCode: string): Promise<null> {
+    return (this._transport.request('continue_autocrypt_key_transfer', [accountId, messageId, setupCode] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public getChatlistEntries(accountId: T.U32, listFlags: (T.U32|null), queryString: (string|null), queryContactId: (T.U32|null)): Promise<(T.ChatListEntry)[]> {
+    return (this._transport.request('get_chatlist_entries', [accountId, listFlags, queryString, queryContactId] as RPC.Params)) as Promise<(T.ChatListEntry)[]>;
+  }
+
+
+  public getChatlistItemsByEntries(accountId: T.U32, entries: (T.ChatListEntry)[]): Promise<Record<T.U32,T.ChatListItemFetchResult>> {
+    return (this._transport.request('get_chatlist_items_by_entries', [accountId, entries] as RPC.Params)) as Promise<Record<T.U32,T.ChatListItemFetchResult>>;
+  }
+
+
+  public getFullChatById(accountId: T.U32, chatId: T.U32): Promise<T.FullChat> {
+    return (this._transport.request('get_full_chat_by_id', [accountId, chatId] as RPC.Params)) as Promise<T.FullChat>;
+  }
+
+  /**
+   * get basic info about a chat,
+   * use chatlist_get_full_chat_by_id() instead if you need more information
+   */
+  public getBasicChatInfo(accountId: T.U32, chatId: T.U32): Promise<T.BasicChat> {
+    return (this._transport.request('get_basic_chat_info', [accountId, chatId] as RPC.Params)) as Promise<T.BasicChat>;
+  }
+
+
+  public acceptChat(accountId: T.U32, chatId: T.U32): Promise<null> {
+    return (this._transport.request('accept_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public blockChat(accountId: T.U32, chatId: T.U32): Promise<null> {
+    return (this._transport.request('block_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Delete a chat.
+   *
+   * Messages are deleted from the device and the chat database entry is deleted.
+   * After that, the event #DC_EVENT_MSGS_CHANGED is posted.
+   *
+   * Things that are _not done_ implicitly:
+   *
+   * - Messages are **not deleted from the server**.
+   * - The chat or the contact is **not blocked**, so new messages from the user/the group may appear as a contact request
+   *   and the user may create the chat again.
+   * - **Groups are not left** - this would
+   *   be unexpected as (1) deleting a normal chat also does not prevent new mails
+   *   from arriving, (2) leaving a group requires sending a message to
+   *   all group members - especially for groups not used for a longer time, this is
+   *   really unexpected when deletion results in contacting all members again,
+   *   (3) only leaving groups is also a valid usecase.
+   *
+   * To leave a chat explicitly, use leave_group()
+   */
+  public deleteChat(accountId: T.U32, chatId: T.U32): Promise<null> {
+    return (this._transport.request('delete_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Get encryption info for a chat.
+   * Get a multi-line encryption info, containing encryption preferences of all members.
+   * Can be used to find out why messages sent to group are not encrypted.
+   *
+   * returns Multi-line text
+   */
+  public getChatEncryptionInfo(accountId: T.U32, chatId: T.U32): Promise<string> {
+    return (this._transport.request('get_chat_encryption_info', [accountId, chatId] as RPC.Params)) as Promise<string>;
+  }
+
+  /**
+   * Get QR code (text and SVG) that will offer an Setup-Contact or Verified-Group invitation.
+   * The QR code is compatible to the OPENPGP4FPR format
+   * so that a basic fingerprint comparison also works e.g. with OpenKeychain.
+   *
+   * The scanning device will pass the scanned content to `checkQr()` then;
+   * if `checkQr()` returns `askVerifyContact` or `askVerifyGroup`
+   * an out-of-band-verification can be joined using `secure_join()`
+   *
+   * chat_id: If set to a group-chat-id,
+   *     the Verified-Group-Invite protocol is offered in the QR code;
+   *     works for protected groups as well as for normal groups.
+   *     If not set, the Setup-Contact protocol is offered in the QR code.
+   *     See https://countermitm.readthedocs.io/en/latest/new.html
+   *     for details about both protocols.
+   *
+   * return format: `[code, svg]`
+   */
+  public getChatSecurejoinQrCodeSvg(accountId: T.U32, chatId: (T.U32|null)): Promise<[string,string]> {
+    return (this._transport.request('get_chat_securejoin_qr_code_svg', [accountId, chatId] as RPC.Params)) as Promise<[string,string]>;
+  }
+
+
+  public setChatEncryptionModus(accountId: T.U32, chatId: T.U32, encryptionModus: T.EncryptionModus): Promise<null> {
+    return (this._transport.request('set_chat_encryption_modus', [accountId, chatId, encryptionModus] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public getChatEncryptionModus(accountId: T.U32, chatId: T.U32): Promise<(T.EncryptionModus|null)> {
+    return (this._transport.request('get_chat_encryption_modus', [accountId, chatId] as RPC.Params)) as Promise<(T.EncryptionModus|null)>;
+  }
+
+  /**
+   * Continue a Setup-Contact or Verified-Group-Invite protocol
+   * started on another device with `get_chat_securejoin_qr_code_svg()`.
+   * This function is typically called when `check_qr()` returns
+   * type=AskVerifyContact or type=AskVerifyGroup.
+   *
+   * The function returns immediately and the handshake runs in background,
+   * sending and receiving several messages.
+   * During the handshake, info messages are added to the chat,
+   * showing progress, success or errors.
+   *
+   * Subsequent calls of `secure_join()` will abort previous, unfinished handshakes.
+   *
+   * See https://countermitm.readthedocs.io/en/latest/new.html
+   * for details about both protocols.
+   *
+   * **qr**: The text of the scanned QR code. Typically, the same string as given
+   *     to `check_qr()`.
+   *
+   * **returns**: The chat ID of the joined chat, the UI may redirect to the this chat.
+   *         A returned chat ID does not guarantee that the chat is protected or the belonging contact is verified.
+   *
+   */
+  public secureJoin(accountId: T.U32, qr: string): Promise<T.U32> {
+    return (this._transport.request('secure_join', [accountId, qr] as RPC.Params)) as Promise<T.U32>;
+  }
+
+
+  public leaveGroup(accountId: T.U32, chatId: T.U32): Promise<null> {
+    return (this._transport.request('leave_group', [accountId, chatId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Remove a member from a group.
+   *
+   * If the group is already _promoted_ (any message was sent to the group),
+   * all group members are informed by a special status message that is sent automatically by this function.
+   *
+   * Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
+   */
+  public removeContactFromChat(accountId: T.U32, chatId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('remove_contact_from_chat', [accountId, chatId, contactId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Add a member to a group.
+   *
+   * If the group is already _promoted_ (any message was sent to the group),
+   * all group members are informed by a special status message that is sent automatically by this function.
+   *
+   * If the group has group protection enabled, only verified contacts can be added to the group.
+   *
+   * Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
+   */
+  public addContactToChat(accountId: T.U32, chatId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('add_contact_to_chat', [accountId, chatId, contactId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Get the contact IDs belonging to a chat.
+   *
+   * - for normal chats, the function always returns exactly one contact,
+   *   DC_CONTACT_ID_SELF is returned only for SELF-chats.
+   *
+   * - for group chats all members are returned, DC_CONTACT_ID_SELF is returned
+   *   explicitly as it may happen that oneself gets removed from a still existing
+   *   group
+   *
+   * - for broadcasts, all recipients are returned, DC_CONTACT_ID_SELF is not included
+   *
+   * - for mailing lists, the behavior is not documented currently, we will decide on that later.
+   *   for now, the UI should not show the list for mailing lists.
+   *   (we do not know all members and there is not always a global mailing list address,
+   *   so we could return only SELF or the known members; this is not decided yet)
+   */
+  public getChatContacts(accountId: T.U32, chatId: T.U32): Promise<(T.U32)[]> {
+    return (this._transport.request('get_chat_contacts', [accountId, chatId] as RPC.Params)) as Promise<(T.U32)[]>;
+  }
+
+  /**
+   * Create a new group chat.
+   *
+   * After creation,
+   * the group has one member with the ID DC_CONTACT_ID_SELF
+   * and is in _unpromoted_ state.
+   * This means, you can add or remove members, change the name,
+   * the group image and so on without messages being sent to all group members.
+   *
+   * This changes as soon as the first message is sent to the group members
+   * and the group becomes _promoted_.
+   * After that, all changes are synced with all group members
+   * by sending status message.
+   *
+   * To check, if a chat is still unpromoted, you can look at the `is_unpromoted` property of `BasicChat` or `FullChat`.
+   * This may be useful if you want to show some help for just created groups.
+   *
+   * @param protect If set to 1 the function creates group with protection initially enabled.
+   *     Only verified members are allowed in these groups
+   *     and end-to-end-encryption is always enabled.
+   */
+  public createGroupChat(accountId: T.U32, name: string, protect: boolean): Promise<T.U32> {
+    return (this._transport.request('create_group_chat', [accountId, name, protect] as RPC.Params)) as Promise<T.U32>;
+  }
+
+  /**
+   * Create a new broadcast list.
+   *
+   * Broadcast lists are similar to groups on the sending device,
+   * however, recipients get the messages in normal one-to-one chats
+   * and will not be aware of other members.
+   *
+   * Replies to broadcasts go only to the sender
+   * and not to all broadcast recipients.
+   * Moreover, replies will not appear in the broadcast list
+   * but in the one-to-one chat with the person answering.
+   *
+   * The name and the image of the broadcast list is set automatically
+   * and is visible to the sender only.
+   * Not asking for these data allows more focused creation
+   * and we bypass the question who will get which data.
+   * Also, many users will have at most one broadcast list
+   * so, a generic name and image is sufficient at the first place.
+   *
+   * Later on, however, the name can be changed using dc_set_chat_name().
+   * The image cannot be changed to have a unique, recognizable icon in the chat lists.
+   * All in all, this is also what other messengers are doing here.
+   */
+  public createBroadcastList(accountId: T.U32): Promise<T.U32> {
+    return (this._transport.request('create_broadcast_list', [accountId] as RPC.Params)) as Promise<T.U32>;
+  }
+
+  /**
+   * Set group name.
+   *
+   * If the group is already _promoted_ (any message was sent to the group),
+   * all group members are informed by a special status message that is sent automatically by this function.
+   *
+   * Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
+   */
+  public setChatName(accountId: T.U32, chatId: T.U32, newName: string): Promise<null> {
+    return (this._transport.request('set_chat_name', [accountId, chatId, newName] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Set group profile image.
+   *
+   * If the group is already _promoted_ (any message was sent to the group),
+   * all group members are informed by a special status message that is sent automatically by this function.
+   *
+   * Sends out #DC_EVENT_CHAT_MODIFIED and #DC_EVENT_MSGS_CHANGED if a status message was sent.
+   *
+   * To find out the profile image of a chat, use dc_chat_get_profile_image()
+   *
+   * @param image_path Full path of the image to use as the group image. The image will immediately be copied to the
+   *     `blobdir`; the original image will not be needed anymore.
+   *      If you pass null here, the group image is deleted (for promoted groups, all members are informed about
+   *      this change anyway).
+   */
+  public setChatProfileImage(accountId: T.U32, chatId: T.U32, imagePath: (string|null)): Promise<null> {
+    return (this._transport.request('set_chat_profile_image', [accountId, chatId, imagePath] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public setChatVisibility(accountId: T.U32, chatId: T.U32, visibility: T.ChatVisibility): Promise<null> {
+    return (this._transport.request('set_chat_visibility', [accountId, chatId, visibility] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public setChatEphemeralTimer(accountId: T.U32, chatId: T.U32, timer: T.U32): Promise<null> {
+    return (this._transport.request('set_chat_ephemeral_timer', [accountId, chatId, timer] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public getChatEphemeralTimer(accountId: T.U32, chatId: T.U32): Promise<T.U32> {
+    return (this._transport.request('get_chat_ephemeral_timer', [accountId, chatId] as RPC.Params)) as Promise<T.U32>;
+  }
+
+
+  public addDeviceMessage(accountId: T.U32, label: string, text: string): Promise<T.U32> {
+    return (this._transport.request('add_device_message', [accountId, label, text] as RPC.Params)) as Promise<T.U32>;
+  }
+
+  /**
+   *  Mark all messages in a chat as _noticed_.
+   *  _Noticed_ messages are no longer _fresh_ and do not count as being unseen
+   *  but are still waiting for being marked as "seen" using markseen_msgs()
+   *  (IMAP/MDNs is not done for noticed messages).
+   *
+   *  Calling this function usually results in the event #DC_EVENT_MSGS_NOTICED.
+   *  See also markseen_msgs().
+   */
+  public marknoticedChat(accountId: T.U32, chatId: T.U32): Promise<null> {
+    return (this._transport.request('marknoticed_chat', [accountId, chatId] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public getFirstUnreadMessageOfChat(accountId: T.U32, chatId: T.U32): Promise<(T.U32|null)> {
+    return (this._transport.request('get_first_unread_message_of_chat', [accountId, chatId] as RPC.Params)) as Promise<(T.U32|null)>;
+  }
+
+  /**
+   * Set mute duration of a chat.
+   *
+   * The UI can then call is_chat_muted() when receiving a new message
+   * to decide whether it should trigger an notification.
+   *
+   * Muted chats should not sound or vibrate
+   * and should not show a visual notification in the system area.
+   * Moreover, muted chats should be excluded from global badge counter
+   * (get_fresh_msgs() skips muted chats therefore)
+   * and the in-app, per-chat badge counter should use a less obtrusive color.
+   *
+   * Sends out #DC_EVENT_CHAT_MODIFIED.
+   */
+  public setChatMuteDuration(accountId: T.U32, chatId: T.U32, duration: T.MuteDuration): Promise<null> {
+    return (this._transport.request('set_chat_mute_duration', [accountId, chatId, duration] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Check whether the chat is currently muted (can be changed by set_chat_mute_duration()).
+   *
+   * This is available as a standalone function outside of fullchat, because it might be only needed for notification
+   */
+  public isChatMuted(accountId: T.U32, chatId: T.U32): Promise<boolean> {
+    return (this._transport.request('is_chat_muted', [accountId, chatId] as RPC.Params)) as Promise<boolean>;
+  }
+
+  /**
+   * Mark messages as presented to the user.
+   * Typically, UIs call this function on scrolling through the message list,
+   * when the messages are presented at least for a little moment.
+   * The concrete action depends on the type of the chat and on the users settings
+   * (dc_msgs_presented() may be a better name therefore, but well. :)
+   *
+   * - For normal chats, the IMAP state is updated, MDN is sent
+   *   (if set_config()-options `mdns_enabled` is set)
+   *   and the internal state is changed to @ref DC_STATE_IN_SEEN to reflect these actions.
+   *
+   * - For contact requests, no IMAP or MDNs is done
+   *   and the internal state is not changed therefore.
+   *   See also marknoticed_chat().
+   *
+   * Moreover, timer is started for incoming ephemeral messages.
+   * This also happens for contact requests chats.
+   *
+   * One #DC_EVENT_MSGS_NOTICED event is emitted per modified chat.
+   */
+  public markseenMsgs(accountId: T.U32, msgIds: (T.U32)[]): Promise<null> {
+    return (this._transport.request('markseen_msgs', [accountId, msgIds] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public getMessageIds(accountId: T.U32, chatId: T.U32, flags: T.U32): Promise<(T.U32)[]> {
+    return (this._transport.request('get_message_ids', [accountId, chatId, flags] as RPC.Params)) as Promise<(T.U32)[]>;
+  }
+
+
+  public getMessageListItems(accountId: T.U32, chatId: T.U32, flags: T.U32): Promise<(T.MessageListItem)[]> {
+    return (this._transport.request('get_message_list_items', [accountId, chatId, flags] as RPC.Params)) as Promise<(T.MessageListItem)[]>;
+  }
+
+
+  public getMessage(accountId: T.U32, messageId: T.U32): Promise<T.Message> {
+    return (this._transport.request('get_message', [accountId, messageId] as RPC.Params)) as Promise<T.Message>;
+  }
+
+
+  public getMessageHtml(accountId: T.U32, messageId: T.U32): Promise<(string|null)> {
+    return (this._transport.request('get_message_html', [accountId, messageId] as RPC.Params)) as Promise<(string|null)>;
+  }
+
+
+  public getMessages(accountId: T.U32, messageIds: (T.U32)[]): Promise<Record<T.U32,T.Message>> {
+    return (this._transport.request('get_messages', [accountId, messageIds] as RPC.Params)) as Promise<Record<T.U32,T.Message>>;
+  }
+
+  /**
+   * Fetch info desktop needs for creating a notification for a message
+   */
+  public getMessageNotificationInfo(accountId: T.U32, messageId: T.U32): Promise<T.MessageNotificationInfo> {
+    return (this._transport.request('get_message_notification_info', [accountId, messageId] as RPC.Params)) as Promise<T.MessageNotificationInfo>;
+  }
+
+  /**
+   * Delete messages. The messages are deleted on the current device and
+   * on the IMAP server.
+   */
+  public deleteMessages(accountId: T.U32, messageIds: (T.U32)[]): Promise<null> {
+    return (this._transport.request('delete_messages', [accountId, messageIds] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Get an informational text for a single message. The text is multiline and may
+   * contain e.g. the raw text of the message.
+   *
+   * The max. text returned is typically longer (about 100000 characters) than the
+   * max. text returned by dc_msg_get_text() (about 30000 characters).
+   */
+  public getMessageInfo(accountId: T.U32, messageId: T.U32): Promise<string> {
+    return (this._transport.request('get_message_info', [accountId, messageId] as RPC.Params)) as Promise<string>;
+  }
+
+  /**
+   * Asks the core to start downloading a message fully.
+   * This function is typically called when the user hits the "Download" button
+   * that is shown by the UI in case `download_state` is `'Available'` or `'Failure'`
+   *
+   * On success, the @ref DC_MSG "view type of the message" may change
+   * or the message may be replaced completely by one or more messages with other message IDs.
+   * That may happen e.g. in cases where the message was encrypted
+   * and the type could not be determined without fully downloading.
+   * Downloaded content can be accessed as usual after download.
+   *
+   * To reflect these changes a @ref DC_EVENT_MSGS_CHANGED event will be emitted.
+   */
+  public downloadFullMessage(accountId: T.U32, messageId: T.U32): Promise<null> {
+    return (this._transport.request('download_full_message', [accountId, messageId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Search messages containing the given query string.
+   * Searching can be done globally (chat_id=0) or in a specified chat only (chat_id set).
+   *
+   * Global chat results are typically displayed using dc_msg_get_summary(), chat
+   * search results may just hilite the corresponding messages and present a
+   * prev/next button.
+   *
+   * For global search, result is limited to 1000 messages,
+   * this allows incremental search done fast.
+   * So, when getting exactly 1000 results, the result may be truncated;
+   * the UIs may display sth. as "1000+ messages found" in this case.
+   * Chat search (if a chat_id is set) is not limited.
+   */
+  public searchMessages(accountId: T.U32, query: string, chatId: (T.U32|null)): Promise<(T.U32)[]> {
+    return (this._transport.request('search_messages', [accountId, query, chatId] as RPC.Params)) as Promise<(T.U32)[]>;
+  }
+
+
+  public messageIdsToSearchResults(accountId: T.U32, messageIds: (T.U32)[]): Promise<Record<T.U32,T.MessageSearchResult>> {
+    return (this._transport.request('message_ids_to_search_results', [accountId, messageIds] as RPC.Params)) as Promise<Record<T.U32,T.MessageSearchResult>>;
+  }
+
+  /**
+   * Get a single contact options by ID.
+   */
+  public getContact(accountId: T.U32, contactId: T.U32): Promise<T.Contact> {
+    return (this._transport.request('get_contact', [accountId, contactId] as RPC.Params)) as Promise<T.Contact>;
+  }
+
+  /**
+   * Add a single contact as a result of an explicit user action.
+   *
+   * Returns contact id of the created or existing contact
+   */
+  public createContact(accountId: T.U32, email: string, name: (string|null)): Promise<T.U32> {
+    return (this._transport.request('create_contact', [accountId, email, name] as RPC.Params)) as Promise<T.U32>;
+  }
+
+  /**
+   * Returns contact id of the created or existing DM chat with that contact
+   */
+  public createChatByContactId(accountId: T.U32, contactId: T.U32): Promise<T.U32> {
+    return (this._transport.request('create_chat_by_contact_id', [accountId, contactId] as RPC.Params)) as Promise<T.U32>;
+  }
+
+
+  public blockContact(accountId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('block_contact', [accountId, contactId] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public unblockContact(accountId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('unblock_contact', [accountId, contactId] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public getBlockedContacts(accountId: T.U32): Promise<(T.Contact)[]> {
+    return (this._transport.request('get_blocked_contacts', [accountId] as RPC.Params)) as Promise<(T.Contact)[]>;
+  }
+
+
+  public getContactIds(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.U32)[]> {
+    return (this._transport.request('get_contact_ids', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.U32)[]>;
+  }
+
+  /**
+   * Get a list of contacts.
+   * (formerly called getContacts2 in desktop)
+   */
+  public getContacts(accountId: T.U32, listFlags: T.U32, query: (string|null)): Promise<(T.Contact)[]> {
+    return (this._transport.request('get_contacts', [accountId, listFlags, query] as RPC.Params)) as Promise<(T.Contact)[]>;
+  }
+
+
+  public getContactsByIds(accountId: T.U32, ids: (T.U32)[]): Promise<Record<T.U32,T.Contact>> {
+    return (this._transport.request('get_contacts_by_ids', [accountId, ids] as RPC.Params)) as Promise<Record<T.U32,T.Contact>>;
+  }
+
+
+  public deleteContact(accountId: T.U32, contactId: T.U32): Promise<null> {
+    return (this._transport.request('delete_contact', [accountId, contactId] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public changeContactName(accountId: T.U32, contactId: T.U32, name: string): Promise<null> {
+    return (this._transport.request('change_contact_name', [accountId, contactId, name] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Get encryption info for a contact.
+   * Get a multi-line encryption info, containing your fingerprint and the
+   * fingerprint of the contact, used e.g. to compare the fingerprints for a simple out-of-band verification.
+   */
+  public getContactEncryptionInfo(accountId: T.U32, contactId: T.U32): Promise<string> {
+    return (this._transport.request('get_contact_encryption_info', [accountId, contactId] as RPC.Params)) as Promise<string>;
+  }
+
+  /**
+   * Check if an e-mail address belongs to a known and unblocked contact.
+   * To get a list of all known and unblocked contacts, use contacts_get_contacts().
+   *
+   * To validate an e-mail address independently of the contact database
+   * use check_email_validity().
+   */
+  public lookupContactIdByAddr(accountId: T.U32, addr: string): Promise<(T.U32|null)> {
+    return (this._transport.request('lookup_contact_id_by_addr', [accountId, addr] as RPC.Params)) as Promise<(T.U32|null)>;
+  }
+
+  /**
+   * Returns all message IDs of the given types in a chat.
+   * Typically used to show a gallery.
+   *
+   * The list is already sorted and starts with the oldest message.
+   * Clients should not try to re-sort the list as this would be an expensive action
+   * and would result in inconsistencies between clients.
+   *
+   * Setting `chat_id` to `None` (`null` in typescript) means get messages with media
+   * from any chat of the currently used account.
+   */
+  public getChatMedia(accountId: T.U32, chatId: (T.U32|null), messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<(T.U32)[]> {
+    return (this._transport.request('get_chat_media', [accountId, chatId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<(T.U32)[]>;
+  }
+
+  /**
+   * Search next/previous message based on a given message and a list of types.
+   * Typically used to implement the "next" and "previous" buttons
+   * in a gallery or in a media player.
+   *
+   * one combined call for getting chat::get_next_media for both directions
+   * the manual chat::get_next_media in only one direction is not exposed by the jsonrpc yet
+   */
+  public getNeighboringChatMedia(accountId: T.U32, msgId: T.U32, messageType: T.Viewtype, orMessageType2: (T.Viewtype|null), orMessageType3: (T.Viewtype|null)): Promise<[(T.U32|null),(T.U32|null)]> {
+    return (this._transport.request('get_neighboring_chat_media', [accountId, msgId, messageType, orMessageType2, orMessageType3] as RPC.Params)) as Promise<[(T.U32|null),(T.U32|null)]>;
+  }
+
+
+  public exportBackup(accountId: T.U32, destination: string, passphrase: (string|null)): Promise<null> {
+    return (this._transport.request('export_backup', [accountId, destination, passphrase] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public importBackup(accountId: T.U32, path: string, passphrase: (string|null)): Promise<null> {
+    return (this._transport.request('import_backup', [accountId, path, passphrase] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Indicate that the network likely has come back.
+   * or just that the network conditions might have changed
+   */
+  public maybeNetwork(): Promise<null> {
+    return (this._transport.request('maybe_network', [] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * Get the current connectivity, i.e. whether the device is connected to the IMAP server.
+   * One of:
+   * - DC_CONNECTIVITY_NOT_CONNECTED (1000-1999): Show e.g. the string "Not connected" or a red dot
+   * - DC_CONNECTIVITY_CONNECTING (2000-2999): Show e.g. the string "Connecting…" or a yellow dot
+   * - DC_CONNECTIVITY_WORKING (3000-3999): Show e.g. the string "Getting new messages" or a spinning wheel
+   * - DC_CONNECTIVITY_CONNECTED (>=4000): Show e.g. the string "Connected" or a green dot
+   *
+   * We don't use exact values but ranges here so that we can split up
+   * states into multiple states in the future.
+   *
+   * Meant as a rough overview that can be shown
+   * e.g. in the title of the main screen.
+   *
+   * If the connectivity changes, a #DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
+   */
+  public getConnectivity(accountId: T.U32): Promise<T.U32> {
+    return (this._transport.request('get_connectivity', [accountId] as RPC.Params)) as Promise<T.U32>;
+  }
+
+  /**
+   * Get an overview of the current connectivity, and possibly more statistics.
+   * Meant to give the user more insight about the current status than
+   * the basic connectivity info returned by get_connectivity(); show this
+   * e.g., if the user taps on said basic connectivity info.
+   *
+   * If this page changes, a #DC_EVENT_CONNECTIVITY_CHANGED will be emitted.
+   *
+   * This comes as an HTML from the core so that we can easily improve it
+   * and the improvement instantly reaches all UIs.
+   */
+  public getConnectivityHtml(accountId: T.U32): Promise<string> {
+    return (this._transport.request('get_connectivity_html', [accountId] as RPC.Params)) as Promise<string>;
+  }
+
+
+  public getLocations(accountId: T.U32, chatId: (T.U32|null), contactId: (T.U32|null), timestampBegin: T.I64, timestampEnd: T.I64): Promise<(T.Location)[]> {
+    return (this._transport.request('get_locations', [accountId, chatId, contactId, timestampBegin, timestampEnd] as RPC.Params)) as Promise<(T.Location)[]>;
+  }
+
+
+  public sendWebxdcStatusUpdate(accountId: T.U32, instanceMsgId: T.U32, updateStr: string, description: string): Promise<null> {
+    return (this._transport.request('send_webxdc_status_update', [accountId, instanceMsgId, updateStr, description] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public getWebxdcStatusUpdates(accountId: T.U32, instanceMsgId: T.U32, lastKnownSerial: T.U32): Promise<string> {
+    return (this._transport.request('get_webxdc_status_updates', [accountId, instanceMsgId, lastKnownSerial] as RPC.Params)) as Promise<string>;
+  }
+
+  /**
+   * Get info from a webxdc message
+   */
+  public getWebxdcInfo(accountId: T.U32, instanceMsgId: T.U32): Promise<T.WebxdcMessageInfo> {
+    return (this._transport.request('get_webxdc_info', [accountId, instanceMsgId] as RPC.Params)) as Promise<T.WebxdcMessageInfo>;
+  }
+
+  /**
+   * Forward messages to another chat.
+   *
+   * All types of messages can be forwarded,
+   * however, they will be flagged as such (dc_msg_is_forwarded() is set).
+   *
+   * Original sender, info-state and webxdc updates are not forwarded on purpose.
+   */
+  public forwardMessages(accountId: T.U32, messageIds: (T.U32)[], chatId: T.U32): Promise<null> {
+    return (this._transport.request('forward_messages', [accountId, messageIds, chatId] as RPC.Params)) as Promise<null>;
+  }
+
+
+  public sendSticker(accountId: T.U32, chatId: T.U32, stickerPath: string): Promise<T.U32> {
+    return (this._transport.request('send_sticker', [accountId, chatId, stickerPath] as RPC.Params)) as Promise<T.U32>;
+  }
+
+  /**
+   * Send a reaction to message.
+   *
+   * Reaction is a string of emojis separated by spaces. Reaction to a
+   * single message can be sent multiple times. The last reaction
+   * received overrides all previously received reactions. It is
+   * possible to remove all reactions by sending an empty string.
+   */
+  public sendReaction(accountId: T.U32, messageId: T.U32, reaction: (string)[]): Promise<T.U32> {
+    return (this._transport.request('send_reaction', [accountId, messageId, reaction] as RPC.Params)) as Promise<T.U32>;
+  }
+
+
+  public removeDraft(accountId: T.U32, chatId: T.U32): Promise<null> {
+    return (this._transport.request('remove_draft', [accountId, chatId] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   *  Get draft for a chat, if any.
+   */
+  public getDraft(accountId: T.U32, chatId: T.U32): Promise<(T.Message|null)> {
+    return (this._transport.request('get_draft', [accountId, chatId] as RPC.Params)) as Promise<(T.Message|null)>;
+  }
+
+
+  public sendVideochatInvitation(accountId: T.U32, chatId: T.U32): Promise<T.U32> {
+    return (this._transport.request('send_videochat_invitation', [accountId, chatId] as RPC.Params)) as Promise<T.U32>;
+  }
+
+
+  public miscGetStickerFolder(accountId: T.U32): Promise<string> {
+    return (this._transport.request('misc_get_sticker_folder', [accountId] as RPC.Params)) as Promise<string>;
+  }
+
+  /**
+   * save a sticker to a collection/folder in the account's sticker folder
+   */
+  public miscSaveSticker(accountId: T.U32, msgId: T.U32, collection: string): Promise<null> {
+    return (this._transport.request('misc_save_sticker', [accountId, msgId, collection] as RPC.Params)) as Promise<null>;
+  }
+
+  /**
+   * for desktop, get stickers from stickers folder,
+   * grouped by the collection/folder they are in.
+   */
+  public miscGetStickers(accountId: T.U32): Promise<Record<string,(string)[]>> {
+    return (this._transport.request('misc_get_stickers', [accountId] as RPC.Params)) as Promise<Record<string,(string)[]>>;
+  }
+
+  /**
+   * Returns the messageid of the sent message
+   */
+  public miscSendTextMessage(accountId: T.U32, chatId: T.U32, text: string): Promise<T.U32> {
+    return (this._transport.request('misc_send_text_message', [accountId, chatId, text] as RPC.Params)) as Promise<T.U32>;
+  }
+
+
+  public miscSendMsg(accountId: T.U32, chatId: T.U32, text: (string|null), file: (string|null), location: ([T.F64,T.F64]|null), quotedMessageId: (T.U32|null)): Promise<[T.U32,T.Message]> {
+    return (this._transport.request('misc_send_msg', [accountId, chatId, text, file, location, quotedMessageId] as RPC.Params)) as Promise<[T.U32,T.Message]>;
+  }
+
+
+  public miscSetDraft(accountId: T.U32, chatId: T.U32, text: (string|null), file: (string|null), quotedMessageId: (T.U32|null)): Promise<null> {
+    return (this._transport.request('misc_set_draft', [accountId, chatId, text, file, quotedMessageId] as RPC.Params)) as Promise<null>;
+  }
+
+
+}

deltachat-jsonrpc/typescript/generated/constants.ts

@@ -0,0 +1,199 @@
+// Generated!
+
+export enum C {
+  DC_CERTCK_ACCEPT_INVALID_CERTIFICATES = 3,
+  DC_CERTCK_AUTO = 0,
+  DC_CERTCK_STRICT = 1,
+  DC_CHAT_ID_ALLDONE_HINT = 7,
+  DC_CHAT_ID_ARCHIVED_LINK = 6,
+  DC_CHAT_ID_LAST_SPECIAL = 9,
+  DC_CHAT_ID_TRASH = 3,
+  DC_CHAT_TYPE_BROADCAST = 160,
+  DC_CHAT_TYPE_GROUP = 120,
+  DC_CHAT_TYPE_MAILINGLIST = 140,
+  DC_CHAT_TYPE_SINGLE = 100,
+  DC_CHAT_TYPE_UNDEFINED = 0,
+  DC_CONNECTIVITY_CONNECTED = 4000,
+  DC_CONNECTIVITY_CONNECTING = 2000,
+  DC_CONNECTIVITY_NOT_CONNECTED = 1000,
+  DC_CONNECTIVITY_WORKING = 3000,
+  DC_CONTACT_ID_DEVICE = 5,
+  DC_CONTACT_ID_INFO = 2,
+  DC_CONTACT_ID_LAST_SPECIAL = 9,
+  DC_CONTACT_ID_SELF = 1,
+  DC_GCL_ADD_ALLDONE_HINT = 4,
+  DC_GCL_ADD_SELF = 2,
+  DC_GCL_ARCHIVED_ONLY = 1,
+  DC_GCL_FOR_FORWARDING = 8,
+  DC_GCL_NO_SPECIALS = 2,
+  DC_GCL_VERIFIED_ONLY = 1,
+  DC_GCM_ADDDAYMARKER = 1,
+  DC_GCM_INFO_ONLY = 2,
+  DC_KEY_GEN_DEFAULT = 0,
+  DC_KEY_GEN_ED25519 = 2,
+  DC_KEY_GEN_RSA2048 = 1,
+  DC_LP_AUTH_NORMAL = 4,
+  DC_LP_AUTH_OAUTH2 = 2,
+  DC_MEDIA_QUALITY_BALANCED = 0,
+  DC_MEDIA_QUALITY_WORSE = 1,
+  DC_MSG_ID_DAYMARKER = 9,
+  DC_MSG_ID_LAST_SPECIAL = 9,
+  DC_MSG_ID_MARKER1 = 1,
+  DC_PROVIDER_STATUS_BROKEN = 3,
+  DC_PROVIDER_STATUS_OK = 1,
+  DC_PROVIDER_STATUS_PREPARATION = 2,
+  DC_SHOW_EMAILS_ACCEPTED_CONTACTS = 1,
+  DC_SHOW_EMAILS_ALL = 2,
+  DC_SHOW_EMAILS_OFF = 0,
+  DC_SOCKET_AUTO = 0,
+  DC_SOCKET_PLAIN = 3,
+  DC_SOCKET_SSL = 1,
+  DC_SOCKET_STARTTLS = 2,
+  DC_STATE_IN_FRESH = 10,
+  DC_STATE_IN_NOTICED = 13,
+  DC_STATE_IN_SEEN = 16,
+  DC_STATE_OUT_DELIVERED = 26,
+  DC_STATE_OUT_DRAFT = 19,
+  DC_STATE_OUT_FAILED = 24,
+  DC_STATE_OUT_MDN_RCVD = 28,
+  DC_STATE_OUT_PENDING = 20,
+  DC_STATE_OUT_PREPARING = 18,
+  DC_STATE_UNDEFINED = 0,
+  DC_STR_AC_SETUP_MSG_BODY = 43,
+  DC_STR_AC_SETUP_MSG_SUBJECT = 42,
+  DC_STR_ADD_MEMBER_BY_OTHER = 129,
+  DC_STR_ADD_MEMBER_BY_YOU = 128,
+  DC_STR_AEAP_ADDR_CHANGED = 122,
+  DC_STR_AEAP_EXPLANATION_AND_LINK = 123,
+  DC_STR_ARCHIVEDCHATS = 40,
+  DC_STR_AUDIO = 11,
+  DC_STR_BAD_TIME_MSG_BODY = 85,
+  DC_STR_BROADCAST_LIST = 115,
+  DC_STR_CANNOT_LOGIN = 60,
+  DC_STR_CANTDECRYPT_MSG_BODY = 29,
+  DC_STR_CONFIGURATION_FAILED = 84,
+  DC_STR_CONNECTED = 107,
+  DC_STR_CONNTECTING = 108,
+  DC_STR_CONTACT_NOT_VERIFIED = 36,
+  DC_STR_CONTACT_SETUP_CHANGED = 37,
+  DC_STR_CONTACT_VERIFIED = 35,
+  DC_STR_DEVICE_MESSAGES = 68,
+  DC_STR_DEVICE_MESSAGES_HINT = 70,
+  DC_STR_DOWNLOAD_AVAILABILITY = 100,
+  DC_STR_DRAFT = 3,
+  DC_STR_E2E_AVAILABLE = 25,
+  DC_STR_E2E_PREFERRED = 34,
+  DC_STR_ENCRYPTEDMSG = 24,
+  DC_STR_ENCR_NONE = 28,
+  DC_STR_ENCR_TRANSP = 27,
+  DC_STR_EPHEMERAL_DAY = 79,
+  DC_STR_EPHEMERAL_DAYS = 95,
+  DC_STR_EPHEMERAL_DISABLED = 75,
+  DC_STR_EPHEMERAL_FOUR_WEEKS = 81,
+  DC_STR_EPHEMERAL_HOUR = 78,
+  DC_STR_EPHEMERAL_HOURS = 94,
+  DC_STR_EPHEMERAL_MINUTE = 77,
+  DC_STR_EPHEMERAL_MINUTES = 93,
+  DC_STR_EPHEMERAL_SECONDS = 76,
+  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER = 147,
+  DC_STR_EPHEMERAL_TIMER_1_DAY_BY_YOU = 146,
+  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER = 145,
+  DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_YOU = 144,
+  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER = 143,
+  DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_YOU = 142,
+  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER = 149,
+  DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_YOU = 148,
+  DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER = 155,
+  DC_STR_EPHEMERAL_TIMER_DAYS_BY_YOU = 154,
+  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER = 139,
+  DC_STR_EPHEMERAL_TIMER_DISABLED_BY_YOU = 138,
+  DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER = 153,
+  DC_STR_EPHEMERAL_TIMER_HOURS_BY_YOU = 152,
+  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER = 151,
+  DC_STR_EPHEMERAL_TIMER_MINUTES_BY_YOU = 150,
+  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER = 141,
+  DC_STR_EPHEMERAL_TIMER_SECONDS_BY_YOU = 140,
+  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER = 157,
+  DC_STR_EPHEMERAL_TIMER_WEEKS_BY_YOU = 156,
+  DC_STR_EPHEMERAL_WEEK = 80,
+  DC_STR_EPHEMERAL_WEEKS = 96,
+  DC_STR_ERROR = 112,
+  DC_STR_ERROR_NO_NETWORK = 87,
+  DC_STR_FAILED_SENDING_TO = 74,
+  DC_STR_FILE = 12,
+  DC_STR_FINGERPRINTS = 30,
+  DC_STR_FORWARDED = 97,
+  DC_STR_GIF = 23,
+  DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER = 127,
+  DC_STR_GROUP_IMAGE_CHANGED_BY_YOU = 126,
+  DC_STR_GROUP_IMAGE_DELETED_BY_OTHER = 135,
+  DC_STR_GROUP_IMAGE_DELETED_BY_YOU = 134,
+  DC_STR_GROUP_LEFT_BY_OTHER = 133,
+  DC_STR_GROUP_LEFT_BY_YOU = 132,
+  DC_STR_GROUP_NAME_CHANGED_BY_OTHER = 125,
+  DC_STR_GROUP_NAME_CHANGED_BY_YOU = 124,
+  DC_STR_IMAGE = 9,
+  DC_STR_INCOMING_MESSAGES = 103,
+  DC_STR_LAST_MSG_SENT_SUCCESSFULLY = 111,
+  DC_STR_LOCATION = 66,
+  DC_STR_LOCATION_ENABLED_BY_OTHER = 137,
+  DC_STR_LOCATION_ENABLED_BY_YOU = 136,
+  DC_STR_MESSAGES = 114,
+  DC_STR_MSGACTIONBYME = 63,
+  DC_STR_MSGACTIONBYUSER = 62,
+  DC_STR_MSGADDMEMBER = 17,
+  DC_STR_MSGDELMEMBER = 18,
+  DC_STR_MSGGROUPLEFT = 19,
+  DC_STR_MSGGRPIMGCHANGED = 16,
+  DC_STR_MSGGRPIMGDELETED = 33,
+  DC_STR_MSGGRPNAME = 15,
+  DC_STR_MSGLOCATIONDISABLED = 65,
+  DC_STR_MSGLOCATIONENABLED = 64,
+  DC_STR_NOMESSAGES = 1,
+  DC_STR_NOT_CONNECTED = 121,
+  DC_STR_NOT_SUPPORTED_BY_PROVIDER = 113,
+  DC_STR_ONE_MOMENT = 106,
+  DC_STR_OUTGOING_MESSAGES = 104,
+  DC_STR_PARTIAL_DOWNLOAD_MSG_BODY = 99,
+  DC_STR_PART_OF_TOTAL_USED = 116,
+  DC_STR_PROTECTION_DISABLED = 89,
+  DC_STR_PROTECTION_DISABLED_BY_OTHER = 161,
+  DC_STR_PROTECTION_DISABLED_BY_YOU = 160,
+  DC_STR_PROTECTION_ENABLED = 88,
+  DC_STR_PROTECTION_ENABLED_BY_OTHER = 159,
+  DC_STR_PROTECTION_ENABLED_BY_YOU = 158,
+  DC_STR_QUOTA_EXCEEDING_MSG_BODY = 98,
+  DC_STR_READRCPT = 31,
+  DC_STR_READRCPT_MAILBODY = 32,
+  DC_STR_REMOVE_MEMBER_BY_OTHER = 131,
+  DC_STR_REMOVE_MEMBER_BY_YOU = 130,
+  DC_STR_REPLY_NOUN = 90,
+  DC_STR_SAVED_MESSAGES = 69,
+  DC_STR_SECURE_JOIN_GROUP_QR_DESC = 120,
+  DC_STR_SECURE_JOIN_REPLIES = 118,
+  DC_STR_SECURE_JOIN_STARTED = 117,
+  DC_STR_SELF = 2,
+  DC_STR_SELF_DELETED_MSG_BODY = 91,
+  DC_STR_SENDING = 110,
+  DC_STR_SERVER_TURNED_OFF = 92,
+  DC_STR_SETUP_CONTACT_QR_DESC = 119,
+  DC_STR_STICKER = 67,
+  DC_STR_STORAGE_ON_DOMAIN = 105,
+  DC_STR_SUBJECT_FOR_NEW_CONTACT = 73,
+  DC_STR_SYNC_MSG_BODY = 102,
+  DC_STR_SYNC_MSG_SUBJECT = 101,
+  DC_STR_UNKNOWN_SENDER_FOR_CHAT = 72,
+  DC_STR_UPDATE_REMINDER_MSG_BODY = 86,
+  DC_STR_UPDATING = 109,
+  DC_STR_VIDEO = 10,
+  DC_STR_VIDEOCHAT_INVITATION = 82,
+  DC_STR_VIDEOCHAT_INVITE_MSG_BODY = 83,
+  DC_STR_VOICEMESSAGE = 7,
+  DC_STR_WELCOME_MESSAGE = 71,
+  DC_TEXT1_DRAFT = 1,
+  DC_TEXT1_SELF = 3,
+  DC_TEXT1_USERNAME = 2,
+  DC_VIDEOCHATTYPE_BASICWEBRTC = 1,
+  DC_VIDEOCHATTYPE_JITSI = 2,
+  DC_VIDEOCHATTYPE_UNKNOWN = 0,
+}

deltachat-jsonrpc/typescript/generated/events.ts

@@ -0,0 +1,214 @@
+// AUTO-GENERATED by typescript-type-def
+
+export type U32=number;
+export type Usize=number;
+export type Event=(({
+/**
+ * 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.
+ */
+"type":"Info";}&{"msg":string;})|({
+/**
+ * Emitted when SMTP connection is established and login was successful.
+ */
+"type":"SmtpConnected";}&{"msg":string;})|({
+/**
+ * Emitted when IMAP connection is established and login was successful.
+ */
+"type":"ImapConnected";}&{"msg":string;})|({
+/**
+ * Emitted when a message was successfully sent to the SMTP server.
+ */
+"type":"SmtpMessageSent";}&{"msg":string;})|({
+/**
+ * Emitted when an IMAP message has been marked as deleted
+ */
+"type":"ImapMessageDeleted";}&{"msg":string;})|({
+/**
+ * Emitted when an IMAP message has been moved
+ */
+"type":"ImapMessageMoved";}&{"msg":string;})|({
+/**
+ * Emitted when an new file in the $BLOBDIR was created
+ */
+"type":"NewBlobFile";}&{"file":string;})|({
+/**
+ * Emitted when an file in the $BLOBDIR was deleted
+ */
+"type":"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.
+ */
+"type":"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.
+ */
+"type":"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.
+ */
+"type":"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.
+ */
+"type":"MsgsChanged";}&{"chatId":U32;"msgId":U32;})|({
+/**
+ * Reactions for the message changed.
+ */
+"type":"ReactionsChanged";}&{"chatId":U32;"msgId":U32;"contactId":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.
+ */
+"type":"IncomingMsg";}&{"chatId":U32;"msgId":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.
+ */
+"type":"IncomingMsgBunch";}&{"msgIds":(U32)[];})|({
+/**
+ * Messages were seen or noticed.
+ * chat id is always set.
+ */
+"type":"MsgsNoticed";}&{"chatId":U32;})|({
+/**
+ * A single message is sent successfully. State changed from  DC_STATE_OUT_PENDING to
+ * DC_STATE_OUT_DELIVERED, see `Message.state`.
+ */
+"type":"MsgDelivered";}&{"chatId":U32;"msgId":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`.
+ */
+"type":"MsgFailed";}&{"chatId":U32;"msgId":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`.
+ */
+"type":"MsgRead";}&{"chatId":U32;"msgId":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.
+ */
+"type":"ChatModified";}&{"chatId":U32;})|({
+/**
+ * Chat ephemeral timer changed.
+ */
+"type":"ChatEphemeralTimerModified";}&{"chatId":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.
+ */
+"type":"ContactsChanged";}&{"contactId":(U32|null);})|({
+/**
+ * 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`.
+ */
+"type":"LocationChanged";}&{"contactId":(U32|null);})|({
+/**
+ * Inform about the configuration progress started by configure().
+ */
+"type":"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":(string|null);})|({
+/**
+ * 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
+ */
+"type":"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
+ */
+"type":"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.
+ */
+"type":"SecurejoinInviterProgress";}&{"contactId":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)
+ */
+"type":"SecurejoinJoinerProgress";}&{"contactId":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.
+ */
+"type":"ConnectivityChanged";}|{"type":"SelfavatarChanged";}|({"type":"WebxdcStatusUpdate";}&{"msgId":U32;"statusUpdateSerial":U32;})|({
+/**
+ * Inform that a message containing a webxdc instance has been deleted
+ */
+"type":"WebxdcInstanceDeleted";}&{"msgId":U32;}));

deltachat-jsonrpc/typescript/generated/jsonrpc.ts

@@ -0,0 +1,10 @@
+// AUTO-GENERATED by typescript-type-def
+
+export type JSONValue=(null|boolean|number|string|(JSONValue)[]|{[key:string]:JSONValue;});
+export type Params=((JSONValue)[]|Record<string,JSONValue>);
+export type U32=number;
+export type Request={"jsonrpc":"2.0";"method":string;"params"?:Params;"id"?:U32;};
+export type I32=number;
+export type Error={"code":I32;"message":string;"data"?:JSONValue;};
+export type Response={"jsonrpc":"2.0";"id":(U32|null);"result"?:JSONValue;"error"?:Error;};
+export type Message=(Request|Response);

deltachat-jsonrpc/typescript/generated/types.ts

@@ -0,0 +1,199 @@
+// AUTO-GENERATED by typescript-type-def
+
+export type U32=number;
+export type Account=(({"type":"Configured";}&{"id":U32;"displayName":(string|null);"addr":(string|null);"profileImage":(string|null);"color":string;})|({"type":"Unconfigured";}&{"id":U32;}));
+export type U64=number;
+export type ProviderInfo={"beforeLoginHint":string;"overviewPage":string;"status":U32;};
+export type Qr=(({"type":"askVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"askVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"fprOk";}&{"contact_id":U32;})|({"type":"fprMismatch";}&{"contact_id":(U32|null);})|({"type":"fprWithoutAddr";}&{"fingerprint":string;})|({"type":"account";}&{"domain":string;})|({"type":"webrtcInstance";}&{"domain":string;"instance_pattern":string;})|({"type":"addr";}&{"contact_id":U32;"draft":(string|null);})|({"type":"url";}&{"url":string;})|({"type":"text";}&{"text":string;})|({"type":"withdrawVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"withdrawVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"reviveVerifyContact";}&{"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"reviveVerifyGroup";}&{"grpname":string;"grpid":string;"contact_id":U32;"fingerprint":string;"invitenumber":string;"authcode":string;})|({"type":"login";}&{"address":string;}));
+export type Usize=number;
+export type I64=number;
+export type ChatListEntry=[U32,U32];
+export type ChatListItemFetchResult=(({"type":"ChatListItem";}&{"id":U32;"name":string;"avatarPath":(string|null);"color":string;"lastUpdated":(I64|null);"summaryText1":string;"summaryText2":string;"summaryStatus":U32;"isProtected":boolean;"isGroup":boolean;"freshMessageCounter":Usize;"isSelfTalk":boolean;"isDeviceTalk":boolean;"isSendingLocation":boolean;"isSelfInGroup":boolean;"isArchived":boolean;"isPinned":boolean;"isMuted":boolean;"isContactRequest":boolean;
+/**
+ * true when chat is a broadcastlist
+ */
+"isBroadcast":boolean;
+/**
+ * contact id if this is a dm chat (for view profile entry in context menu)
+ */
+"dmChatContact":(U32|null);"wasSeenRecently":boolean;})|{"type":"ArchiveLink";}|({"type":"Error";}&{"id":U32;"error":string;}));
+export type Contact={"address":string;"color":string;"authName":string;"status":string;"displayName":string;"id":U32;"name":string;"profileImage":(string|null);"nameAndAddr":string;"isBlocked":boolean;"isVerified":boolean;
+/**
+ * the contact's last seen timestamp
+ */
+"lastSeen":I64;"wasSeenRecently":boolean;};
+export type FullChat={"id":U32;"name":string;"isProtected":boolean;"profileImage":(string|null);"archived":boolean;"chatType":U32;"isUnpromoted":boolean;"isSelfTalk":boolean;"contacts":(Contact)[];"contactIds":(U32)[];"color":string;"freshMessageCounter":Usize;"isContactRequest":boolean;"isDeviceChat":boolean;"selfInGroup":boolean;"isMuted":boolean;"ephemeralTimer":U32;"canSend":boolean;"wasSeenRecently":boolean;"mailingListAddress":(string|null);};
+
+/**
+ * cheaper version of fullchat, omits:
+ * - contacts
+ * - contact_ids
+ * - fresh_message_counter
+ * - ephemeral_timer
+ * - self_in_group
+ * - was_seen_recently
+ * - can_send
+ * 
+ * used when you only need the basic metadata of a chat like type, name, profile picture
+ */
+export type BasicChat=
+/**
+ * cheaper version of fullchat, omits:
+ * - contacts
+ * - contact_ids
+ * - fresh_message_counter
+ * - ephemeral_timer
+ * - self_in_group
+ * - was_seen_recently
+ * - can_send
+ * 
+ * used when you only need the basic metadata of a chat like type, name, profile picture
+ */
+{"id":U32;"name":string;"isProtected":boolean;"profileImage":(string|null);"archived":boolean;"chatType":U32;"isUnpromoted":boolean;"isSelfTalk":boolean;"color":string;"isContactRequest":boolean;"isDeviceChat":boolean;"isMuted":boolean;};
+export type EncryptionModus=("Opportunistic"|"ForcePlaintext"|"ForceEncrypted"|"ForceVerified");
+export type ChatVisibility=("Normal"|"Archived"|"Pinned");
+export type MuteDuration=("NotMuted"|"Forever"|{"Until":I64;});
+export type MessageListItem=(({"kind":"message";}&{"msg_id":U32;})|({
+/**
+ * Day marker, separating messages that correspond to different
+ * days according to local time.
+ */
+"kind":"dayMarker";}&{
+/**
+ * Marker timestamp, for day markers, in unix milliseconds
+ */
+"timestamp":I64;}));
+export type Viewtype=("Unknown"|
+/**
+ * Text message.
+ */
+"Text"|
+/**
+ * Image message.
+ * If the image is an animated GIF, the type `Viewtype.Gif` should be used.
+ */
+"Image"|
+/**
+ * Animated GIF message.
+ */
+"Gif"|
+/**
+ * Message containing a sticker, similar to image.
+ * If possible, the ui should display the image without borders in a transparent way.
+ * A click on a sticker will offer to install the sticker set in some future.
+ */
+"Sticker"|
+/**
+ * Message containing an Audio file.
+ */
+"Audio"|
+/**
+ * A voice message that was directly recorded by the user.
+ * For all other audio messages, the type `Viewtype.Audio` should be used.
+ */
+"Voice"|
+/**
+ * Video messages.
+ */
+"Video"|
+/**
+ * Message containing any file, eg. a PDF.
+ */
+"File"|
+/**
+ * Message is an invitation to a videochat.
+ */
+"VideochatInvitation"|
+/**
+ * Message is an webxdc instance.
+ */
+"Webxdc");
+export type MessageQuote=(({"kind":"JustText";}&{"text":string;})|({"kind":"WithMessage";}&{"text":string;"messageId":U32;"authorDisplayName":string;"authorDisplayColor":string;"overrideSenderName":(string|null);"image":(string|null);"isForwarded":boolean;"viewType":Viewtype;}));
+export type SystemMessageType=("Unknown"|"GroupNameChanged"|"GroupImageChanged"|"MemberAddedToGroup"|"MemberRemovedFromGroup"|"AutocryptSetupMessage"|"SecurejoinMessage"|"LocationStreamingEnabled"|"LocationOnly"|
+/**
+ * Chat ephemeral message timer is changed.
+ */
+"EphemeralTimerChanged"|"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"|"WebxdcStatusUpdate"|
+/**
+ * Webxdc info added with `info` set in `send_webxdc_status_update()`.
+ */
+"WebxdcInfoMessage");
+export type I32=number;
+export type WebxdcMessageInfo={
+/**
+ * The name of the app.
+ * 
+ * Defaults to the filename if not set in the manifest.
+ */
+"name":string;
+/**
+ * App icon file name.
+ * Defaults to an standard icon if nothing is set in the manifest.
+ * 
+ * To get the file, use dc_msg_get_webxdc_blob(). (not yet in jsonrpc, use rust api or cffi for it)
+ * 
+ * App icons should should be square,
+ * the implementations will add round corners etc. as needed.
+ */
+"icon":string;
+/**
+ * if the Webxdc represents a document, then this is the name of the document
+ */
+"document":(string|null);
+/**
+ * short string describing the state of the app,
+ * sth. as "2 votes", "Highscore: 123",
+ * can be changed by the apps
+ */
+"summary":(string|null);
+/**
+ * URL where the source code of the Webxdc and other information can be found;
+ * defaults to an empty string.
+ * Implementations may offer an menu or a button to open this URL.
+ */
+"sourceCodeUrl":(string|null);
+/**
+ * True if full internet access should be granted to the app.
+ */
+"internetAccess":boolean;};
+export type DownloadState=("Done"|"Available"|"Failure"|"InProgress");
+
+/**
+ * Structure representing all reactions to a particular message.
+ */
+export type Reactions=
+/**
+ * Structure representing all reactions to a particular message.
+ */
+{
+/**
+ * Map from a contact to it's reaction to message.
+ */
+"reactionsByContact":Record<U32,(string)[]>;
+/**
+ * Unique reactions and their count
+ */
+"reactions":Record<string,U32>;};
+export type Message={"id":U32;"chatId":U32;"fromId":U32;"quote":(MessageQuote|null);"parentId":(U32|null);"text":(string|null);"hasLocation":boolean;"hasHtml":boolean;"viewType":Viewtype;"state":U32;"timestamp":I64;"sortTimestamp":I64;"receivedTimestamp":I64;"hasDeviatingTimestamp":boolean;"subject":string;"showPadlock":boolean;"isSetupmessage":boolean;"isInfo":boolean;"isForwarded":boolean;
+/**
+ * when is_info is true this describes what type of system message it is
+ */
+"systemMessageType":SystemMessageType;"duration":I32;"dimensionsHeight":I32;"dimensionsWidth":I32;"videochatType":(U32|null);"videochatUrl":(string|null);"overrideSenderName":(string|null);"sender":Contact;"setupCodeBegin":(string|null);"file":(string|null);"fileMime":(string|null);"fileBytes":U64;"fileName":(string|null);"webxdcInfo":(WebxdcMessageInfo|null);"downloadState":DownloadState;"reactions":(Reactions|null);};
+export type MessageNotificationInfo={"id":U32;"chatId":U32;"accountId":U32;"image":(string|null);"imageMimeType":(string|null);"chatName":string;"chatProfileImage":(string|null);
+/**
+ * also known as summary_text1
+ */
+"summaryPrefix":(string|null);
+/**
+ * also known as summary_text2
+ */
+"summaryText":string;};
+export type MessageSearchResult={"id":U32;"authorProfileImage":(string|null);"authorName":string;"authorColor":string;"chatName":(string|null);"message":string;"timestamp":I64;};
+export type F64=number;
+export type Location={"locationId":U32;"isIndependent":boolean;"latitude":F64;"longitude":F64;"accuracy":F64;"timestamp":I64;"contactId":U32;"msgId":U32;"chatId":U32;"marker":(string|null);};
+export type __AllTyps=[string,boolean,Record<string,string>,U32,U32,null,(U32)[],U32,null,(U32|null),(Account)[],null,null,U32,null,U32,null,U32,Account,U32,U64,U32,string,(ProviderInfo|null),U32,boolean,U32,Record<string,string>,U32,string,(string|null),null,U32,Record<string,(string|null)>,null,U32,string,null,U32,string,Qr,U32,string,(string|null),U32,(string)[],Record<string,(string|null)>,Record<U32,string>,null,U32,null,U32,null,U32,string,(string|null),null,U32,string,(string|null),null,U32,(U32)[],U32,U32,Usize,U32,boolean,I64,Usize,U32,string,U32,U32,string,null,U32,(U32|null),(string|null),(U32|null),(ChatListEntry)[],U32,(ChatListEntry)[],Record<U32,ChatListItemFetchResult>,U32,U32,FullChat,U32,U32,BasicChat,U32,U32,null,U32,U32,null,U32,U32,null,U32,U32,string,U32,(U32|null),[string,string],U32,U32,EncryptionModus,null,U32,U32,(EncryptionModus|null),U32,string,U32,U32,U32,null,U32,U32,U32,null,U32,U32,U32,null,U32,U32,(U32)[],U32,string,boolean,U32,U32,U32,U32,U32,string,null,U32,U32,(string|null),null,U32,U32,ChatVisibility,null,U32,U32,U32,null,U32,U32,U32,U32,string,string,U32,U32,U32,null,U32,U32,(U32|null),U32,U32,MuteDuration,null,U32,U32,boolean,U32,(U32)[],null,U32,U32,U32,(U32)[],U32,U32,U32,(MessageListItem)[],U32,U32,Message,U32,U32,(string|null),U32,(U32)[],Record<U32,Message>,U32,U32,MessageNotificationInfo,U32,(U32)[],null,U32,U32,string,U32,U32,null,U32,string,(U32|null),(U32)[],U32,(U32)[],Record<U32,MessageSearchResult>,U32,U32,Contact,U32,string,(string|null),U32,U32,U32,U32,U32,U32,null,U32,U32,null,U32,(Contact)[],U32,U32,(string|null),(U32)[],U32,U32,(string|null),(Contact)[],U32,(U32)[],Record<U32,Contact>,U32,U32,null,U32,U32,string,null,U32,U32,string,U32,string,(U32|null),U32,(U32|null),Viewtype,(Viewtype|null),(Viewtype|null),(U32)[],U32,U32,Viewtype,(Viewtype|null),(Viewtype|null),[(U32|null),(U32|null)],U32,string,(string|null),null,U32,string,(string|null),null,null,U32,U32,U32,string,U32,(U32|null),(U32|null),I64,I64,(Location)[],U32,U32,string,string,null,U32,U32,U32,string,U32,U32,WebxdcMessageInfo,U32,(U32)[],U32,null,U32,U32,string,U32,U32,U32,(string)[],U32,U32,U32,null,U32,U32,(Message|null),U32,U32,U32,U32,string,U32,U32,string,null,U32,Record<string,(string)[]>,U32,U32,string,U32,U32,U32,(string|null),(string|null),([F64,F64]|null),(U32|null),[U32,Message],U32,U32,(string|null),(string|null),(U32|null),null];

deltachat-jsonrpc/typescript/package.json

@@ -48,5 +48,5 @@
   },
   "type": "module",
   "types": "dist/deltachat.d.ts",
-  "version": "1.106.0"
+  "version": "1.101.0"
 }

deltachat-jsonrpc/typescript/test/online.ts

@@ -12,7 +12,7 @@ describe("online tests", function () {
   let accountId1: number, accountId2: number;
 
   before(async function () {
-    this.timeout(60000);
+    this.timeout(12000);
     if (!process.env.DCC_NEW_TMP_EMAIL) {
       if (process.env.COVERAGE && !process.env.COVERAGE_OFFLINE) {
         console.error(

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,26 +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(event):
-    snapshot = event.message_snapshot
-    await snapshot.chat.send_text(snapshot.text)
-
-
-if __name__ == "__main__":
-    asyncio.run(run_bot_cli(hooks))

deltachat-rpc-client/examples/echobot_advanced.py

@@ -1,73 +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.MemberListChanged)
-async def on_memberlist_changed(event):
-    logging.info("member %s was %s", event.member, "added" if event.member_added else "removed")
-
-
-@hooks.on(events.GroupImageChanged)
-async def on_group_image_changed(event):
-    logging.info("group image %s", "deleted" if event.image_deleted else "changed")
-
-
-@hooks.on(events.GroupNameChanged)
-async def on_group_name_changed(event):
-    logging.info("group name changed, old name: %s", event.old_name)
-
-
-@hooks.on(events.NewMessage(func=lambda e: not e.command))
-async def echo(event):
-    snapshot = event.message_snapshot
-    if snapshot.text or snapshot.file:
-        await snapshot.chat.send_message(text=snapshot.text, file=snapshot.file)
-
-
-@hooks.on(events.NewMessage(command="/help"))
-async def help_command(event):
-    snapshot = event.message_snapshot
-    await snapshot.chat.send_text("Send me any message and I will echo it back")
-
-
-async def main():
-    async with Rpc() as rpc:
-        deltachat = DeltaChat(rpc)
-        system_info = await deltachat.get_system_info()
-        logging.info("Running deltachat core %s", system_info.deltachat_core_version)
-
-        accounts = await deltachat.get_all_accounts()
-        account = accounts[0] if accounts else await deltachat.add_account()
-
-        bot = Bot(account, hooks)
-        if not await bot.is_configured():
-            asyncio.create_task(bot.configure(email=sys.argv[1], password=sys.argv[2]))
-        await bot.run_forever()
-
-
-if __name__ == "__main__":
-    logging.basicConfig(level=logging.INFO)
-    asyncio.run(main())

deltachat-rpc-client/examples/echobot_no_hooks.py

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,102 +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 None
-
-        return method

deltachat-rpc-client/tests/test_something.py

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

deltachat-rpc-client/tests/test_webxdc.py

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

deltachat-rpc-client/tox.ini

@@ -1,29 +0,0 @@
-[tox]
-isolated_build = true
-envlist =
-    py3
-    lint
-
-[testenv]
-commands =
-    pytest {posargs}
-setenv =
-# Avoid stack overflow when Rust core is built without optimizations.
-    RUST_MIN_STACK=8388608
-passenv =
-    DCC_NEW_TMP_EMAIL
-deps =
-    pytest
-    pytest-asyncio
-    aiohttp
-    aiodns
-
-[testenv:lint]
-skipsdist = True
-skip_install = True
-deps =
-    ruff
-    black
-commands =
-    black --check src/ examples/ tests/
-    ruff src/ examples/ tests/

deltachat-rpc-server/Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "deltachat-rpc-server"
-version = "1.106.0"
+version = "1.101.0"
 description = "DeltaChat JSON-RPC server"
+authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2021"
 readme = "README.md"
 license = "MPL-2.0"
@@ -16,10 +17,10 @@ name = "deltachat-rpc-server"
 deltachat-jsonrpc = { path = "../deltachat-jsonrpc" }
 
 anyhow = "1"
-env_logger = { version = "0.10.0" }
+env_logger = { version = "0.9.1" }
 futures-lite = "1.12.0"
 log = "0.4"
-serde_json = "1.0.91"
+serde_json = "1.0.85"
 serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.23.1", features = ["io-std"] }
+tokio = { version = "1.21.2", features = ["io-std"] }
 yerpc = { version = "0.3.1", features = ["anyhow_expose"] }

deltachat_derive/Cargo.toml

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

deltachat_derive/src/lib.rs

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

draft/webxdc-dev-reference.md

@@ -4,7 +4,7 @@ This document gives a quick overview about the Webxdc specification,
 It is meant for both, developing Webxdc apps
 and developing Webxdc implementations.
 
-The [Webxdc guidebook](https://docs.webxdc.org/) shows more detailed information
+The [Webxdc guidebook](https://deltachat.github.io/webxdc_docs/) shows more detailed information
 when developing Webxdc apps.
 
 

examples/simple.rs

@@ -1,3 +1,5 @@
+use tempfile::tempdir;
+
 use deltachat::chat::{self, ChatId};
 use deltachat::chatlist::*;
 use deltachat::config;
@@ -6,7 +8,6 @@ use deltachat::context::*;
 use deltachat::message::Message;
 use deltachat::stock_str::StockStrings;
 use deltachat::{EventType, Events};
-use tempfile::tempdir;
 
 fn cb(event: EventType) {
     match event {

format-flowed/Cargo.toml

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

fuzz/Cargo.toml

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

fuzz/fuzz_targets/fuzz_dateparse.rs

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

fuzz/fuzz_targets/fuzz_format_flowed.rs

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

fuzz/fuzz_targets/fuzz_mailparse.rs

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

fuzz/fuzz_targets/fuzz_simplify.rs

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

node/test/test.js

@@ -1,29 +1,32 @@
 // @ts-check
-import DeltaChat from '../dist'
+import DeltaChat, { Message } from '../dist'
+import binding from '../binding'
 
-import { deepStrictEqual, strictEqual } from 'assert'
+import { deepEqual, deepStrictEqual, strictEqual } from 'assert'
 import chai, { expect } from 'chai'
 import chaiAsPromised from 'chai-as-promised'
 import { EventId2EventName, C } from '../dist/constants'
 import { join } from 'path'
-import { statSync } from 'fs'
+import { mkdtempSync, statSync } from 'fs'
+import { tmpdir } from 'os'
 import { Context } from '../dist/context'
-import fetch from 'node-fetch'
 chai.use(chaiAsPromised)
-chai.config.truncateThreshold = 0 // Do not truncate assertion errors.
 
 async function createTempUser(url) {
+  const fetch = require('node-fetch')
+
   async function postData(url = '') {
     // Default options are marked with *
     const response = await fetch(url, {
       method: 'POST', // *GET, POST, PUT, DELETE, etc.
+      mode: 'cors', // no-cors, *cors, same-origin
+      cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached
+      credentials: 'same-origin', // include, *same-origin, omit
       headers: {
         'cache-control': 'no-cache',
       },
+      referrerPolicy: 'no-referrer', // no-referrer, *client
     })
-    if (!response.ok) {
-      throw new Error('request failed: ' + response.body.read())
-    }
     return response.json() // parses JSON response into native JavaScript objects
   }
 
@@ -118,7 +121,7 @@ describe('JSON RPC', function () {
     const promises = {}
     dc.startJsonRpcHandler((msg) => {
       const response = JSON.parse(msg)
-      if (response.hasOwnProperty('id')) promises[response.id](response)
+      promises[response.id](response)
       delete promises[response.id]
     })
     const call = (request) => {

package.json

@@ -60,5 +60,5 @@
     "test:mocha": "mocha -r esm node/test/test.js --growl --reporter=spec --bail --exit"
   },
   "types": "node/dist/index.d.ts",
-  "version": "1.106.0"
+  "version": "1.101.0"
 }

python/doc/conf.py

@@ -11,8 +11,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
-import os
+import sys, os
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

python/examples/group_tracking.py

@@ -34,10 +34,8 @@ class GroupTrackingPlugin:
     def ac_member_added(self, chat, contact, actor, message):
         print(
             "ac_member_added {} to chat {} from {}".format(
-                contact.addr,
-                chat.id,
-                actor or message.get_sender_contact().addr,
-            ),
+                contact.addr, chat.id, actor or message.get_sender_contact().addr
+            )
         )
         for member in chat.get_contacts():
             print("chat member: {}".format(member.addr))
@@ -46,10 +44,8 @@ class GroupTrackingPlugin:
     def ac_member_removed(self, chat, contact, actor, message):
         print(
             "ac_member_removed {} from chat {} by {}".format(
-                contact.addr,
-                chat.id,
-                actor or message.get_sender_contact().addr,
-            ),
+                contact.addr, chat.id, actor or message.get_sender_contact().addr
+            )
         )
 
 

python/examples/test_examples.py

@@ -13,8 +13,8 @@ def datadir():
         datadir = path.join("test-data")
         if datadir.isdir():
             return datadir
-    pytest.skip("test-data directory not found")
-    return None
+    else:
+        pytest.skip("test-data directory not found")
 
 
 def test_echo_quit_plugin(acfactory, lp):
@@ -47,7 +47,7 @@ def test_group_tracking_plugin(acfactory, lp):
     botproc.fnmatch_lines(
         """
         *ac_configure_completed*
-    """,
+    """
     )
     ac1.add_account_plugin(FFIEventLogger(ac1))
     ac2.add_account_plugin(FFIEventLogger(ac2))
@@ -61,7 +61,7 @@ def test_group_tracking_plugin(acfactory, lp):
     botproc.fnmatch_lines(
         """
         *ac_chat_modified*bot test group*
-    """,
+    """
     )
 
     lp.sec("adding third member {}".format(ac2.get_config("addr")))
@@ -76,9 +76,8 @@ def test_group_tracking_plugin(acfactory, lp):
         """
         *ac_member_added {}*from*{}*
     """.format(
-            contact3.addr,
-            ac1.get_config("addr"),
-        ),
+            contact3.addr, ac1.get_config("addr")
+        )
     )
 
     lp.sec("contact successfully added, now removing")
@@ -87,7 +86,6 @@ def test_group_tracking_plugin(acfactory, lp):
         """
         *ac_member_removed {}*from*{}*
     """.format(
-            contact3.addr,
-            ac1.get_config("addr"),
-        ),
+            contact3.addr, ac1.get_config("addr")
+        )
     )

python/pyproject.toml

@@ -44,9 +44,5 @@ git_describe_command = "git describe --dirty --tags --long --match py-*.*"
 [tool.black]
 line-length = 120
 
-[tool.ruff]
-select = ["E", "F", "W", "YTT", "C4", "ISC", "ICN", "TID", "DTZ", "PLC", "PLE", "PLW", "PIE", "COM"]
-line-length = 120
-
 [tool.isort]
-profile = "black"
+profile = "black"

python/src/deltachat/__init__.py

@@ -36,8 +36,7 @@ register_global_plugin(events)
 
 def run_cmdline(argv=None, account_plugins=None):
     """Run a simple default command line app, registering the specified
-    account plugins.
-    """
+    account plugins."""
     import argparse
 
     if argv is None:

python/src/deltachat/_build.py

@@ -102,8 +102,8 @@ def find_header(flags):
                     printf("%s", _dc_header_file_location());
                     return 0;
                 }
-            """,
-                ),
+            """
+                )
             )
         cwd = os.getcwd()
         try:
@@ -156,7 +156,6 @@ def extract_defines(flags):
                 | DC_KEY_GEN
                 | DC_IMEX
                 | DC_CONNECTIVITY
-                | DC_DOWNLOAD
             )         # End of prefix matching
             _[\w_]+   # Match the suffix, e.g. _RSA2048 in DC_KEY_GEN_RSA2048
         )             # Close the capturing group, this contains
@@ -198,7 +197,7 @@ def ffibuilder():
         typedef int... time_t;
         void free(void *ptr);
         extern int dc_event_has_string_data(int);
-    """,
+    """
     )
     function_defs = extract_functions(flags)
     defines = extract_defines(flags)

python/src/deltachat/account.py

@@ -1,4 +1,4 @@
-"""Account class implementation."""
+""" Account class implementation. """
 
 from __future__ import print_function
 
@@ -39,7 +39,7 @@ def get_core_info():
             ffi.gc(
                 lib.dc_context_new(as_dc_charpointer(""), as_dc_charpointer(path.name), ffi.NULL),
                 lib.dc_context_unref,
-            ),
+            )
         )
 
 
@@ -82,13 +82,12 @@ class Account(object):
         if hasattr(db_path, "encode"):
             db_path = db_path.encode("utf8")
 
-        ptr = lib.dc_context_new_closed(db_path) if closed else lib.dc_context_new(ffi.NULL, db_path, ffi.NULL)
-        if ptr == ffi.NULL:
-            raise ValueError("Could not dc_context_new: {} {}".format(os_name, db_path))
         self._dc_context = ffi.gc(
-            ptr,
+            lib.dc_context_new_closed(db_path) if closed else lib.dc_context_new(ffi.NULL, db_path, ffi.NULL),
             lib.dc_context_unref,
         )
+        if self._dc_context == ffi.NULL:
+            raise ValueError("Could not dc_context_new: {} {}".format(os_name, db_path))
 
         self._shutdown_event = Event()
         self._event_thread = EventThread(self)
@@ -172,7 +171,10 @@ class Account(object):
         namebytes = name.encode("utf8")
         if isinstance(value, (int, bool)):
             value = str(int(value))
-        valuebytes = value.encode("utf8") if value is not None else ffi.NULL
+        if value is not None:
+            valuebytes = value.encode("utf8")
+        else:
+            valuebytes = ffi.NULL
         lib.dc_set_config(self._dc_context, namebytes, valuebytes)
 
     def get_config(self, name: str) -> str:
@@ -222,10 +224,9 @@ class Account(object):
         return bool(lib.dc_is_configured(self._dc_context))
 
     def is_open(self) -> bool:
-        """Determine if account is open.
+        """Determine if account is open
 
-        :returns True if account is open.
-        """
+        :returns True if account is open."""
         return bool(lib.dc_context_is_open(self._dc_context))
 
     def set_avatar(self, img_path: Optional[str]) -> None:
@@ -541,7 +542,7 @@ class Account(object):
         return from_dc_charpointer(res)
 
     def check_qr(self, qr):
-        """check qr code and return :class:`ScannedQRCode` instance representing the result."""
+        """check qr code and return :class:`ScannedQRCode` instance representing the result"""
         res = ffi.gc(lib.dc_check_qr(self._dc_context, as_dc_charpointer(qr)), lib.dc_lot_unref)
         lot = DCLot(res)
         if lot.state() == const.DC_QR_ERROR:
@@ -660,7 +661,7 @@ class Account(object):
         return lib.dc_all_work_done(self._dc_context)
 
     def start_io(self):
-        """start this account's IO scheduling (Rust-core async scheduler).
+        """start this account's IO scheduling (Rust-core async scheduler)
 
         If this account is not configured an Exception is raised.
         You need to call account.configure() and account.wait_configure_finish()
@@ -703,10 +704,12 @@ class Account(object):
         """
         lib.dc_maybe_network(self._dc_context)
 
-    def configure(self) -> ConfigureTracker:
+    def configure(self, reconfigure: bool = False) -> ConfigureTracker:
         """Start configuration process and return a Configtracker instance
         on which you can block with wait_finish() to get a True/False success
         value for the configuration process.
+
+        :param reconfigure: deprecated, doesn't need to be checked anymore.
         """
         if not self.get_config("addr") or not self.get_config("mail_pw"):
             raise MissingCredentials("addr or mail_pwd not set in config")
@@ -729,8 +732,7 @@ class Account(object):
 
     def shutdown(self) -> None:
         """shutdown and destroy account (stop callback thread, close and remove
-        underlying dc_context).
-        """
+        underlying dc_context)."""
         if self._dc_context is None:
             return
 

python/src/deltachat/chat.py

@@ -1,4 +1,4 @@
-"""Chat and Location related API."""
+""" Chat and Location related API. """
 
 import calendar
 import json
@@ -37,7 +37,7 @@ class Chat(object):
         return self.id == getattr(other, "id", None) and self.account._dc_context == other.account._dc_context
 
     def __ne__(self, other) -> bool:
-        return not self == other
+        return not (self == other)
 
     def __repr__(self) -> str:
         return "<Chat id={} name={}>".format(self.id, self.get_name())
@@ -74,19 +74,19 @@ class Chat(object):
         return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_GROUP
 
     def is_single(self) -> bool:
-        """Return True if this chat is a single/direct chat, False otherwise."""
+        """Return True if this chat is a single/direct chat, False otherwise"""
         return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_SINGLE
 
     def is_mailinglist(self) -> bool:
-        """Return True if this chat is a mailing list, False otherwise."""
+        """Return True if this chat is a mailing list, False otherwise"""
         return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_MAILINGLIST
 
     def is_broadcast(self) -> bool:
-        """Return True if this chat is a broadcast list, False otherwise."""
+        """Return True if this chat is a broadcast list, False otherwise"""
         return lib.dc_chat_get_type(self._dc_chat) == const.DC_CHAT_TYPE_BROADCAST
 
     def is_multiuser(self) -> bool:
-        """Return True if this chat is a multi-user chat (group, mailing list or broadcast), False otherwise."""
+        """Return True if this chat is a multi-user chat (group, mailing list or broadcast), False otherwise"""
         return lib.dc_chat_get_type(self._dc_chat) in (
             const.DC_CHAT_TYPE_GROUP,
             const.DC_CHAT_TYPE_MAILINGLIST,
@@ -94,11 +94,11 @@ class Chat(object):
         )
 
     def is_self_talk(self) -> bool:
-        """Return True if this chat is the self-chat (a.k.a. "Saved Messages"), False otherwise."""
+        """Return True if this chat is the self-chat (a.k.a. "Saved Messages"), False otherwise"""
         return bool(lib.dc_chat_is_self_talk(self._dc_chat))
 
     def is_device_talk(self) -> bool:
-        """Returns True if this chat is the "Device Messages" chat, False otherwise."""
+        """Returns True if this chat is the "Device Messages" chat, False otherwise"""
         return bool(lib.dc_chat_is_device_talk(self._dc_chat))
 
     def is_muted(self) -> bool:
@@ -109,12 +109,12 @@ class Chat(object):
         return bool(lib.dc_chat_is_muted(self._dc_chat))
 
     def is_pinned(self) -> bool:
-        """Return True if this chat is pinned, False otherwise."""
+        """Return True if this chat is pinned, False otherwise"""
         return lib.dc_chat_get_visibility(self._dc_chat) == const.DC_CHAT_VISIBILITY_PINNED
 
     def is_archived(self) -> bool:
         """Return True if this chat is archived, False otherwise.
-        :returns: True if archived, False otherwise.
+        :returns: True if archived, False otherwise
         """
         return lib.dc_chat_get_visibility(self._dc_chat) == const.DC_CHAT_VISIBILITY_ARCHIVED
 
@@ -136,7 +136,7 @@ class Chat(object):
 
     def can_send(self) -> bool:
         """Check if messages can be sent to a give chat.
-        This is not true eg. for the contact requests or for the device-talk.
+        This is not true eg. for the contact requests or for the device-talk
 
         :returns: True if the chat is writable, False otherwise
         """
@@ -167,7 +167,7 @@ class Chat(object):
 
     def get_color(self):
         """return the color of the chat.
-        :returns: color as 0x00rrggbb.
+        :returns: color as 0x00rrggbb
         """
         return lib.dc_chat_get_color(self._dc_chat)
 
@@ -178,18 +178,21 @@ class Chat(object):
         return json.loads(s)
 
     def mute(self, duration: Optional[int] = None) -> None:
-        """mutes the chat.
+        """mutes the chat
 
         :param duration: Number of seconds to mute the chat for. None to mute until unmuted again.
         :returns: None
         """
-        mute_duration = -1 if duration is None else duration
+        if duration is None:
+            mute_duration = -1
+        else:
+            mute_duration = duration
         ret = lib.dc_set_chat_mute_duration(self.account._dc_context, self.id, mute_duration)
         if not bool(ret):
             raise ValueError("Call to dc_set_chat_mute_duration failed")
 
     def unmute(self) -> None:
-        """unmutes the chat.
+        """unmutes the chat
 
         :returns: None
         """
@@ -249,8 +252,7 @@ class Chat(object):
     def get_encryption_info(self) -> Optional[str]:
         """Return encryption info for this chat.
 
-        :returns: a string with encryption preferences of all chat members
-        """
+        :returns: a string with encryption preferences of all chat members"""
         res = lib.dc_get_chat_encrinfo(self.account._dc_context, self.id)
         return from_dc_charpointer(res)
 
@@ -461,7 +463,7 @@ class Chat(object):
 
     def get_contacts(self):
         """get all contacts for this chat.
-        :returns: list of :class:`deltachat.contact.Contact` objects for this chat.
+        :returns: list of :class:`deltachat.contact.Contact` objects for this chat
         """
         from .contact import Contact
 
@@ -545,10 +547,19 @@ class Chat(object):
         :param timespan_to: a datetime object or None (indicating up till now)
         :returns: list of :class:`deltachat.chat.Location` objects.
         """
-        time_from = 0 if timestamp_from is None else calendar.timegm(timestamp_from.utctimetuple())
-        time_to = 0 if timestamp_to is None else calendar.timegm(timestamp_to.utctimetuple())
+        if timestamp_from is None:
+            time_from = 0
+        else:
+            time_from = calendar.timegm(timestamp_from.utctimetuple())
+        if timestamp_to is None:
+            time_to = 0
+        else:
+            time_to = calendar.timegm(timestamp_to.utctimetuple())
 
-        contact_id = 0 if contact is None else contact.id
+        if contact is None:
+            contact_id = 0
+        else:
+            contact_id = contact.id
 
         dc_array = lib.dc_get_locations(self.account._dc_context, self.id, contact_id, time_from, time_to)
         return [

python/src/deltachat/contact.py

@@ -1,4 +1,4 @@
-"""Contact object."""
+""" Contact object. """
 
 from datetime import date, datetime, timezone
 from typing import Optional
@@ -28,7 +28,7 @@ class Contact(object):
         return self.account._dc_context == other.account._dc_context and self.id == other.id
 
     def __ne__(self, other):
-        return not self == other
+        return not (self == other)
 
     def __repr__(self):
         return "<Contact id={} addr={} dc_context={}>".format(self.id, self.addr, self.account._dc_context)
@@ -75,10 +75,6 @@ class Contact(object):
         """Return True if the contact is verified."""
         return lib.dc_contact_is_verified(self._dc_contact)
 
-    def get_verifier(self, contact):
-        """Return the address of the contact that verified the contact."""
-        return from_dc_charpointer(lib.dc_contact_get_verifier_addr(contact._dc_contact))
-
     def get_profile_image(self) -> Optional[str]:
         """Get contact profile image.
 

python/src/deltachat/direct_imap.py

@@ -79,17 +79,15 @@ class DirectImap:
 
     def select_config_folder(self, config_name: str):
         """Return info about selected folder if it is
-        configured, otherwise None.
-        """
+        configured, otherwise None."""
         if "_" not in config_name:
             config_name = "configured_{}_folder".format(config_name)
         foldername = self.account.get_config(config_name)
         if foldername:
             return self.select_folder(foldername)
-        return None
 
     def list_folders(self) -> List[str]:
-        """return list of all existing folder names."""
+        """return list of all existing folder names"""
         assert not self._idling
         return [folder.name for folder in self.conn.folder.list()]
 
@@ -105,7 +103,7 @@ class DirectImap:
 
     def get_all_messages(self) -> List[MailMessage]:
         assert not self._idling
-        return list(self.conn.fetch())
+        return [mail for mail in self.conn.fetch()]
 
     def get_unread_messages(self) -> List[str]:
         assert not self._idling
@@ -223,4 +221,5 @@ class IdleManager:
 
     def done(self):
         """send idle-done to server if we are currently in idle mode."""
-        return self.direct_imap.conn.idle.stop()
+        res = self.direct_imap.conn.idle.stop()
+        return res

python/src/deltachat/events.py

@@ -30,12 +30,6 @@ class FFIEvent:
         self.data2 = data2
 
     def __str__(self):
-        if self.name == "DC_EVENT_INFO":
-            return "INFO {data2}".format(data2=self.data2)
-        if self.name == "DC_EVENT_WARNING":
-            return "WARNING {data2}".format(data2=self.data2)
-        if self.name == "DC_EVENT_ERROR":
-            return "ERROR {data2}".format(data2=self.data2)
         return "{name} data1={data1} data2={data2}".format(**self.__dict__)
 
 
@@ -134,8 +128,7 @@ class FFIEventTracker:
     def wait_for_connectivity(self, connectivity):
         """Wait for the specified connectivity.
         This only works reliably if the connectivity doesn't change
-        again too quickly, otherwise we might miss it.
-        """
+        again too quickly, otherwise we might miss it."""
         while 1:
             if self.account.get_connectivity() == connectivity:
                 return
@@ -143,13 +136,12 @@ class FFIEventTracker:
 
     def wait_for_connectivity_change(self, previous, expected_next):
         """Wait until the connectivity changes to `expected_next`.
-        Fails the test if it changes to something else.
-        """
+        Fails the test if it changes to something else."""
         while 1:
             current = self.account.get_connectivity()
             if current == expected_next:
                 return
-            if current != previous:
+            elif current != previous:
                 raise Exception("Expected connectivity " + str(expected_next) + " but got " + str(current))
 
             self.get_matching("DC_EVENT_CONNECTIVITY_CHANGED")
@@ -184,8 +176,7 @@ class FFIEventTracker:
         - ac1 and ac2 are created
         - ac1 sends a message to ac2
         - ac2 is still running FetchExsistingMsgs job and thinks it's an existing, old message
-        - therefore no DC_EVENT_INCOMING_MSG is sent
-        """
+        - therefore no DC_EVENT_INCOMING_MSG is sent"""
         self.get_info_contains("INBOX: Idle entering")
 
     def wait_next_incoming_message(self):
@@ -195,19 +186,12 @@ class FFIEventTracker:
 
     def wait_next_messages_changed(self):
         """wait for and return next message-changed message or None
-        if the event contains no msgid
-        """
+        if the event contains no msgid"""
         ev = self.get_matching("DC_EVENT_MSGS_CHANGED")
         if ev.data2 > 0:
             return self.account.get_message_by_id(ev.data2)
         return None
 
-    def wait_next_reactions_changed(self):
-        """wait for and return next reactions-changed message."""
-        ev = self.get_matching("DC_EVENT_REACTIONS_CHANGED")
-        assert ev.data1 > 0
-        return self.account.get_message_by_id(ev.data2)
-
     def wait_msg_delivered(self, msg):
         ev = self.get_matching("DC_EVENT_MSG_DELIVERED")
         assert ev.data1 == msg.chat.id
@@ -295,10 +279,10 @@ class EventThread(threading.Thread):
             if data1 == 0 or data1 == 1000:
                 success = data1 == 1000
                 comment = ffi_event.data2
-                yield "ac_configure_completed", {"success": success, "comment": comment}
+                yield "ac_configure_completed", dict(success=success, comment=comment)
         elif name == "DC_EVENT_INCOMING_MSG":
             msg = account.get_message_by_id(ffi_event.data2)
-            yield map_system_message(msg) or ("ac_incoming_message", {"message": msg})
+            yield map_system_message(msg) or ("ac_incoming_message", dict(message=msg))
         elif name == "DC_EVENT_MSGS_CHANGED":
             if ffi_event.data2 != 0:
                 msg = account.get_message_by_id(ffi_event.data2)
@@ -306,19 +290,15 @@ class EventThread(threading.Thread):
                     res = map_system_message(msg)
                     if res and res[0].startswith("ac_member"):
                         yield res
-                    yield "ac_outgoing_message", {"message": msg}
+                    yield "ac_outgoing_message", dict(message=msg)
                 elif msg.is_in_fresh():
                     yield map_system_message(msg) or (
                         "ac_incoming_message",
-                        {"message": msg},
+                        dict(message=msg),
                     )
-        elif name == "DC_EVENT_REACTIONS_CHANGED":
-            assert ffi_event.data1 > 0
-            msg = account.get_message_by_id(ffi_event.data2)
-            yield "ac_reactions_changed", {"message": msg}
         elif name == "DC_EVENT_MSG_DELIVERED":
             msg = account.get_message_by_id(ffi_event.data2)
-            yield "ac_message_delivered", {"message": msg}
+            yield "ac_message_delivered", dict(message=msg)
         elif name == "DC_EVENT_CHAT_MODIFIED":
             chat = account.get_chat_by_id(ffi_event.data1)
-            yield "ac_chat_modified", {"chat": chat}
+            yield "ac_chat_modified", dict(chat=chat)

python/src/deltachat/hookspec.py

@@ -1,4 +1,4 @@
-"""Hooks for Python bindings to Delta Chat Core Rust CFFI."""
+""" Hooks for Python bindings to Delta Chat Core Rust CFFI"""
 
 import pluggy
 
@@ -49,10 +49,6 @@ class PerAccount:
     def ac_outgoing_message(self, message):
         """Called on each outgoing message (both system and "normal")."""
 
-    @account_hookspec
-    def ac_reactions_changed(self, message):
-        """Called when message reactions changed."""
-
     @account_hookspec
     def ac_message_delivered(self, message):
         """Called when an outgoing message has been delivered to SMTP.

python/src/deltachat/message.py

@@ -1,4 +1,4 @@
-"""The Message object."""
+""" The Message object. """
 
 import json
 import os
@@ -9,7 +9,6 @@ from typing import Optional, Union
 from . import const, props
 from .capi import ffi, lib
 from .cutil import as_dc_charpointer, from_dc_charpointer, from_optional_dc_charpointer
-from .reactions import Reactions
 
 
 class Message(object):
@@ -59,7 +58,10 @@ class Message(object):
         :param view_type: the message type code or one of the strings:
            "text", "audio", "video", "file", "sticker", "videochat", "webxdc"
         """
-        view_type_code = view_type if isinstance(view_type, int) else get_viewtype_code_from_name(view_type)
+        if isinstance(view_type, int):
+            view_type_code = view_type
+        else:
+            view_type_code = get_viewtype_code_from_name(view_type)
         return Message(
             account,
             ffi.gc(lib.dc_msg_new(account._dc_context, view_type_code), lib.dc_msg_unref),
@@ -126,7 +128,7 @@ class Message(object):
 
     @props.with_doc
     def filemime(self) -> str:
-        """mime type of the file (if it exists)."""
+        """mime type of the file (if it exists)"""
         return from_dc_charpointer(lib.dc_msg_get_filemime(self._dc_msg))
 
     def get_status_updates(self, serial: int = 0) -> list:
@@ -138,7 +140,7 @@ class Message(object):
         :param serial: The last known serial. Pass 0 if there are no known serials to receive all updates.
         """
         return json.loads(
-            from_dc_charpointer(lib.dc_get_webxdc_status_updates(self.account._dc_context, self.id, serial)),
+            from_dc_charpointer(lib.dc_get_webxdc_status_updates(self.account._dc_context, self.id, serial))
         )
 
     def send_status_update(self, json_data: Union[str, dict], description: str) -> bool:
@@ -155,24 +157,10 @@ class Message(object):
             json_data = json.dumps(json_data, default=str)
         return bool(
             lib.dc_send_webxdc_status_update(
-                self.account._dc_context,
-                self.id,
-                as_dc_charpointer(json_data),
-                as_dc_charpointer(description),
-            ),
+                self.account._dc_context, self.id, as_dc_charpointer(json_data), as_dc_charpointer(description)
+            )
         )
 
-    def send_reaction(self, reaction: str):
-        """Send a reaction to message and return the resulting Message instance."""
-        msg_id = lib.dc_send_reaction(self.account._dc_context, self.id, as_dc_charpointer(reaction))
-        if msg_id == 0:
-            raise ValueError("reaction could not be send")
-        return Message.from_db(self.account, msg_id)
-
-    def get_reactions(self) -> Reactions:
-        """Get :class:`deltachat.reactions.Reactions` to the message."""
-        return Reactions.from_msg(self)
-
     def is_system_message(self):
         """return True if this message is a system/info message."""
         return bool(lib.dc_msg_is_info(self._dc_msg))
@@ -232,18 +220,16 @@ class Message(object):
         ts = lib.dc_msg_get_received_timestamp(self._dc_msg)
         if ts:
             return datetime.fromtimestamp(ts, timezone.utc)
-        return None
 
     @props.with_doc
     def ephemeral_timer(self):
-        """Ephemeral timer in seconds.
+        """Ephemeral timer in seconds
 
         :returns: timer in seconds or None if there is no timer
         """
         timer = lib.dc_msg_get_ephemeral_timer(self._dc_msg)
         if timer:
             return timer
-        return None
 
     @props.with_doc
     def ephemeral_timestamp(self):
@@ -257,25 +243,23 @@ class Message(object):
 
     @property
     def quoted_text(self) -> Optional[str]:
-        """Text inside the quote.
+        """Text inside the quote
 
-        :returns: Quoted text
-        """
+        :returns: Quoted text"""
         return from_optional_dc_charpointer(lib.dc_msg_get_quoted_text(self._dc_msg))
 
     @property
     def quote(self):
-        """Quote getter.
+        """Quote getter
 
-        :returns: Quoted message, if found in the database
-        """
+        :returns: Quoted message, if found in the database"""
         msg = lib.dc_msg_get_quoted_msg(self._dc_msg)
         if msg:
             return Message(self.account, ffi.gc(msg, lib.dc_msg_unref))
 
     @quote.setter
     def quote(self, quoted_message):
-        """Quote setter."""
+        """Quote setter"""
         lib.dc_msg_set_quote(self._dc_msg, quoted_message._dc_msg)
 
     def force_plaintext(self) -> None:
@@ -290,7 +274,7 @@ class Message(object):
 
         :returns: email-mime message object (with headers only, no body).
         """
-        import email
+        import email.parser
 
         mime_headers = lib.dc_get_mime_headers(self.account._dc_context, self.id)
         if mime_headers:
@@ -301,7 +285,7 @@ class Message(object):
 
     @property
     def error(self) -> Optional[str]:
-        """Error message."""
+        """Error message"""
         return from_optional_dc_charpointer(lib.dc_msg_get_error(self._dc_msg))
 
     @property
@@ -465,17 +449,6 @@ class Message(object):
         """mark this message as seen."""
         self.account.mark_seen_messages([self.id])
 
-    #
-    # Message download state
-    #
-    @property
-    def download_state(self):
-        assert self.id > 0
-
-        # load message from db to get a fresh/current state
-        dc_msg = ffi.gc(lib.dc_get_msg(self.account._dc_context, self.id), lib.dc_msg_unref)
-        return lib.dc_msg_get_download_state(dc_msg)
-
 
 # some code for handling DC_MSG_* view types
 
@@ -497,8 +470,7 @@ def get_viewtype_code_from_name(view_type_name):
     if code is not None:
         return code
     raise ValueError(
-        "message typecode not found for {!r}, "
-        "available {!r}".format(view_type_name, list(_view_type_mapping.keys())),
+        "message typecode not found for {!r}, " "available {!r}".format(view_type_name, list(_view_type_mapping.keys()))
     )
 
 
@@ -511,11 +483,14 @@ def map_system_message(msg):
     if msg.is_system_message():
         res = parse_system_add_remove(msg.text)
         if not res:
-            return None
+            return
         action, affected, actor = res
         affected = msg.account.get_contact_by_addr(affected)
-        actor = None if actor == "me" else msg.account.get_contact_by_addr(actor)
-        d = {"chat": msg.chat, "contact": affected, "actor": actor, "message": msg}
+        if actor == "me":
+            actor = None
+        else:
+            actor = msg.account.get_contact_by_addr(actor)
+        d = dict(chat=msg.chat, contact=affected, actor=actor, message=msg)
         return "ac_member_" + res[0], d
 
 
@@ -530,8 +505,8 @@ def extract_addr(text):
 def parse_system_add_remove(text):
     """return add/remove info from parsing the given system message text.
 
-    returns a (action, affected, actor) triple
-    """
+    returns a (action, affected, actor) triple"""
+
     # You removed member a@b.
     # You added member a@b.
     # Member Me (x@y) removed by a@b.

python/src/deltachat/props.py

@@ -8,7 +8,7 @@ def with_doc(f):
 # copied over unmodified from
 # https://github.com/devpi/devpi/blob/master/common/devpi_common/types.py
 def cached(f):
-    """returns a cached property that is calculated by function f."""
+    """returns a cached property that is calculated by function f"""
 
     def get(self):
         try:
@@ -17,9 +17,8 @@ def cached(f):
             self._property_cache = {}
         except KeyError:
             pass
-        res = f(self)
-        self._property_cache[f] = res
-        return res
+        x = self._property_cache[f] = f(self)
+        return x
 
     def set(self, val):
         propcache = self.__dict__.setdefault("_property_cache", {})

python/src/deltachat/provider.py

@@ -9,8 +9,7 @@ class ProviderNotFoundError(Exception):
 
 
 class Provider(object):
-    """
-    Provider information.
+    """Provider information.
 
     :param domain: The email to get the provider info for.
     """

python/src/deltachat/reactions.py

@@ -1,43 +0,0 @@
-"""The Reactions object."""
-
-from .capi import ffi, lib
-from .cutil import from_dc_charpointer, iter_array
-
-
-class Reactions(object):
-    """Reactions object.
-
-    You obtain instances of it through :class:`deltachat.message.Message`.
-    """
-
-    def __init__(self, account, dc_reactions):
-        assert isinstance(account._dc_context, ffi.CData)
-        assert isinstance(dc_reactions, ffi.CData)
-        assert dc_reactions != ffi.NULL
-        self.account = account
-        self._dc_reactions = dc_reactions
-
-    def __repr__(self):
-        return "<Reactions dc_reactions={}>".format(self._dc_reactions)
-
-    @classmethod
-    def from_msg(cls, msg):
-        assert msg.id > 0
-        return cls(
-            msg.account,
-            ffi.gc(lib.dc_get_msg_reactions(msg.account._dc_context, msg.id), lib.dc_reactions_unref),
-        )
-
-    def get_contacts(self) -> list:
-        """Get list of contacts reacted to the message.
-
-        :returns: list of :class:`deltachat.contact.Contact` objects for this reaction.
-        """
-        from .contact import Contact
-
-        dc_array = ffi.gc(lib.dc_reactions_get_contacts(self._dc_reactions), lib.dc_array_unref)
-        return list(iter_array(dc_array, lambda x: Contact(self.account, x)))
-
-    def get_by_contact(self, contact) -> str:
-        """Get a string containing space-separated reactions of a single :class:`deltachat.contact.Contact`."""
-        return from_dc_charpointer(lib.dc_reactions_get_by_contact_id(self._dc_reactions, contact.id))

python/src/deltachat/testplugin.py

@@ -29,7 +29,7 @@ def pytest_addoption(parser):
         "--liveconfig",
         action="store",
         default=None,
-        help="a file with >=2 lines where each line contains NAME=VALUE config settings for one account",
+        help="a file with >=2 lines where each line " "contains NAME=VALUE config settings for one account",
     )
     group.addoption(
         "--ignored",
@@ -124,7 +124,7 @@ def pytest_report_header(config, startdir):
             info["deltachat_core_version"],
             info["sqlite_version"],
             info["journal_mode"],
-        ),
+        )
     ]
 
     cfg = config.option.liveconfig
@@ -176,11 +176,11 @@ class TestProcess:
                 try:
                     yield self._configlist[index]
                 except IndexError:
-                    res = requests.post(liveconfig_opt, timeout=60)
+                    res = requests.post(liveconfig_opt)
                     if res.status_code != 200:
                         pytest.fail("newtmpuser count={} code={}: '{}'".format(index, res.status_code, res.text))
                     d = res.json()
-                    config = {"addr": d["email"], "mail_pw": d["password"]}
+                    config = dict(addr=d["email"], mail_pw=d["password"])
                     print("newtmpuser {}: addr={}".format(index, config["addr"]))
                     self._configlist.append(config)
                     yield config
@@ -229,7 +229,7 @@ def write_dict_to_dir(dic, target_dir):
         path.write_bytes(content)
 
 
-@pytest.fixture()
+@pytest.fixture
 def data(request):
     class Data:
         def __init__(self) -> None:
@@ -253,7 +253,6 @@ def data(request):
                 if os.path.exists(fn):
                     return fn
             print("WARNING: path does not exist: {!r}".format(fn))
-            return None
 
         def read_path(self, bn, mode="r"):
             fn = self.get_path(bn)
@@ -265,11 +264,8 @@ def data(request):
 
 
 class ACSetup:
-    """
-    Accounts setup helper to deal with multiple configure-process
-    and io & imap initialization phases.
-
-    From tests, use the higher level
+    """accounts setup helper to deal with multiple configure-process
+    and io & imap initialization phases. From tests, use the higher level
     public ACFactory methods instead of its private helper class.
     """
 
@@ -293,7 +289,7 @@ class ACSetup:
         self._account2state[account] = self.CONFIGURED
         self.log("added already configured account", account, account.get_config("addr"))
 
-    def start_configure(self, account):
+    def start_configure(self, account, reconfigure=False):
         """add an account and start its configure process."""
 
         class PendingTracker:
@@ -303,7 +299,7 @@ class ACSetup:
 
         account.add_account_plugin(PendingTracker(), name="pending_tracker")
         self._account2state[account] = self.CONFIGURING
-        account.configure()
+        account.configure(reconfigure=reconfigure)
         self.log("started configure on", account)
 
     def wait_one_configured(self, account):
@@ -415,8 +411,7 @@ class ACFactory:
                 acc.disable_logging()
 
     def get_next_liveconfig(self):
-        """
-        Base function to get functional online configurations
+        """Base function to get functional online configurations
         where we can make valid SMTP and IMAP connections with.
         """
         configdict = next(self._liveconfig_producer).copy()
@@ -470,7 +465,8 @@ class ACFactory:
             if fname_pub and fname_sec:
                 account._preconfigure_keypair(addr, fname_pub, fname_sec)
                 return True
-            print("WARN: could not use preconfigured keys for {!r}".format(addr))
+            else:
+                print("WARN: could not use preconfigured keys for {!r}".format(addr))
 
     def get_pseudo_configured_account(self, passphrase: Optional[str] = None) -> Account:
         # do a pseudo-configured account
@@ -480,14 +476,14 @@ class ACFactory:
         acname = ac._logid
         addr = "{}@offline.org".format(acname)
         ac.update_config(
-            {
-                "addr": addr,
-                "displayname": acname,
-                "mail_pw": "123",
-                "configured_addr": addr,
-                "configured_mail_pw": "123",
-                "configured": "1",
-            },
+            dict(
+                addr=addr,
+                displayname=acname,
+                mail_pw="123",
+                configured_addr=addr,
+                configured_mail_pw="123",
+                configured="1",
+            )
         )
         self._preconfigure_key(ac, addr)
         self._acsetup.init_logging(ac)
@@ -498,12 +494,12 @@ class ACFactory:
             configdict = self.get_next_liveconfig()
         else:
             # XXX we might want to transfer the key to the new account
-            configdict = {
-                "addr": cloned_from.get_config("addr"),
-                "mail_pw": cloned_from.get_config("mail_pw"),
-                "imap_certificate_checks": cloned_from.get_config("imap_certificate_checks"),
-                "smtp_certificate_checks": cloned_from.get_config("smtp_certificate_checks"),
-            }
+            configdict = dict(
+                addr=cloned_from.get_config("addr"),
+                mail_pw=cloned_from.get_config("mail_pw"),
+                imap_certificate_checks=cloned_from.get_config("imap_certificate_checks"),
+                smtp_certificate_checks=cloned_from.get_config("smtp_certificate_checks"),
+            )
         configdict.update(kwargs)
         ac = self._get_cached_account(addr=configdict["addr"]) if cache else None
         if ac is not None:
@@ -604,7 +600,7 @@ class ACFactory:
             acc._evtracker.wait_next_incoming_message()
 
 
-@pytest.fixture()
+@pytest.fixture
 def acfactory(request, tmpdir, testprocess, data):
     am = ACFactory(request=request, tmpdir=tmpdir, testprocess=testprocess, data=data)
     yield am
@@ -669,12 +665,12 @@ class BotProcess:
                     ignored.append(line)
 
 
-@pytest.fixture()
+@pytest.fixture
 def tmp_db_path(tmpdir):
     return tmpdir.join("test.db").strpath
 
 
-@pytest.fixture()
+@pytest.fixture
 def lp():
     class Printer:
         def sec(self, msg: str) -> None:

python/src/deltachat/tracker.py

@@ -77,11 +77,11 @@ class ConfigureTracker:
         self.account.remove_account_plugin(self)
 
     def wait_smtp_connected(self):
-        """Wait until SMTP is configured."""
+        """wait until smtp is configured."""
         self._smtp_finished.wait()
 
     def wait_imap_connected(self):
-        """Wait until IMAP is configured."""
+        """wait until smtp is configured."""
         self._imap_finished.wait()
 
     def wait_progress(self, data1=None):
@@ -91,8 +91,7 @@ class ConfigureTracker:
                 break
 
     def wait_finish(self, timeout=None):
-        """
-        Wait until configure is completed.
+        """wait until configure is completed.
 
         Raise Exception if Configure failed
         """

python/tests/auditwheels.py

@@ -15,5 +15,5 @@ if __name__ == "__main__":
                     p,
                     "-w",
                     workspacedir,
-                ],
+                ]
             )

python/tests/data/r

@@ -1,2 +0,0 @@
-
-hello