Filter unconventional commits, they cluttered the changelog too much

Make PR references clickable
Improve template: Always include lines that start with 'BREAKING CHANGE'
2026-07-15 15:33:07 +03:00 · 2023-05-06 19:22:10 +02:00 · 2023-05-06 18:44:35 +02:00 · 2023-05-06 18:41:48 +02:00 · 2023-05-06 17:47:16 +02:00 · 2023-05-06 15:30:52 +02:00
18 changed files with 313 additions and 86 deletions
--- a/.github/mergeable.yml
+++ b/.github/mergeable.yml
@@ -1,26 +1,15 @@
 version: 2
 mergeable:
  - when: pull_request.*
-    name: "Changelog check"
+    name: "Conventional Commits"
    validate:
-      - do: or
-        validate:
-          - do: description
-            must_include:
-              regex: "#skip-changelog"
-          - do: and
-            validate:
-              - do: dependent
-                changed:
-                  file: "src/**"
-                  required: ["CHANGELOG.md"]
-              - do: dependent
-                changed:
-                  file: "deltachat-ffi/src/**"
-                  required: ["CHANGELOG.md"]
+      - do: title
+        begins_with:
+          match: ['feat', 'fix', 'api', 'refactor', 'perf', 'test', 'style', 'chore']
+
    fail:
      - do: checks
        status: "action_required"
        payload:
-          title: Changelog might need an update
-          summary: "Check if CHANGELOG.md needs an update or add #skip-changelog to the PR description."
+          title: PR title should follow conventional commits
+          summary: "PR title should follow https://conventionalcommits.org. E.g. start with 'feat:' (for Features / Changes), 'fix:' (for Fixes), 'api:' (for API-Changes), 'api!:' (for breaking API-Changes) 'refactor:' (for Refactor), 'perf:' (for Performance), 'test:' (for Tests), 'style:' (for Styling), 'chore:' (for Miscellaneous Tasks)"
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,13 +78,13 @@ jobs:
          - os: macos-latest
            rust: 1.68.2

-          # Minimum Supported Rust Version = 1.68.0
+          # Minimum Supported Rust Version = 1.65.0
          #
          # Minimum Supported Python Version = 3.7
          # This is the minimum version for which manylinux Python wheels are
          # built.
          - os: ubuntu-latest
-            rust: 1.68.0
+            rust: 1.65.0
    runs-on: ${{ matrix.os }}
    steps:
      - uses: actions/checkout@v3
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,10 @@
 - BREAKING: jsonrpc:
  - `get_chatlist_items_by_entries` now takes only chatids instead of `ChatListEntries`
  - `get_chatlist_entries` now returns `Vec<u32>` of chatids instead of `ChatListEntries`
- Increase MSRV to 1.68. #4375
+- JSON-RPC: add API to get reactions outside the message snapshot
+### Fixes
+- Make the bots automatically accept group chat contact requests. #4377
+

 ## [1.114.0] - 2023-04-24

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -270,7 +270,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]

 [[package]]
@@ -306,9 +306,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "axum"
-version = "0.6.12"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f8ccfd9221ee7d1f3d4b33e1f8319b3a81ed8f61f2ea40b37b859794b4491"
+checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39"
 dependencies = [
 "async-trait",
 "axum-core",
@@ -341,9 +341,9 @@ dependencies = [

 [[package]]
 name = "axum-core"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2f958c80c248b34b9a877a643811be8dbca03ca5ba827f2b63baf3a81e5fc4e"
+checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
 dependencies = [
 "async-trait",
 "bytes",
@@ -1277,7 +1277,7 @@ name = "deltachat_derive"
 version = "2.0.0"
 dependencies = [
 "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]

 [[package]]
@@ -2057,7 +2057,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]

 [[package]]
@@ -2307,9 +2307,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"

 [[package]]
 name = "human-panic"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6557b29bbdc9d6c7a5cdbe2962e78eaf48115e8d55b0b62282956981c1f605"
+checksum = "c16465f6227e18e5a64eba488245d7b2974d4db0c4404ca5a69b550defa18d0a"
 dependencies = [
 "backtrace",
 "os_info",
@@ -4280,9 +4280,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.159"
+version = "1.0.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
+checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
 dependencies = [
 "serde_derive",
 ]
@@ -4307,13 +4307,13 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.159"
+version = "1.0.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
+checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]

 [[package]]
@@ -4620,9 +4620,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.13"
+version = "2.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4752,7 +4752,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]

 [[package]]
@@ -4830,9 +4830,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.27.0"
+version = "1.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
+checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
 dependencies = [
 "autocfg",
 "bytes",
@@ -4844,7 +4844,7 @@ dependencies = [
 "signal-hook-registry",
 "socket2",
 "tokio-macros",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]

 [[package]]
@@ -4859,13 +4859,13 @@ dependencies = [

 [[package]]
 name = "tokio-macros"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.13",
+ "syn 2.0.15",
 ]

 [[package]]
@@ -4933,9 +4933,9 @@ dependencies = [

 [[package]]
 name = "tokio-util"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
 dependencies = [
 "bytes",
 "futures-core",
@@ -5503,12 +5503,12 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
- "windows_aarch64_gnullvm",
+ "windows_aarch64_gnullvm 0.42.1",
 "windows_aarch64_msvc 0.42.1",
 "windows_i686_gnu 0.42.1",
 "windows_i686_msvc 0.42.1",
 "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm",
+ "windows_x86_64_gnullvm 0.42.1",
 "windows_x86_64_msvc 0.42.1",
 ]

@@ -5518,7 +5518,16 @@ version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.42.1",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.0",
 ]

 [[package]]
@@ -5527,21 +5536,42 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
 dependencies = [
- "windows_aarch64_gnullvm",
+ "windows_aarch64_gnullvm 0.42.1",
 "windows_aarch64_msvc 0.42.1",
 "windows_i686_gnu 0.42.1",
 "windows_i686_msvc 0.42.1",
 "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm",
+ "windows_x86_64_gnullvm 0.42.1",
 "windows_x86_64_msvc 0.42.1",
 ]

+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"

+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.32.0"
@@ -5554,6 +5584,12 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"

+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.32.0"
@@ -5566,6 +5602,12 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"

+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.32.0"
@@ -5578,6 +5620,12 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"

+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.32.0"
@@ -5590,12 +5638,24 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"

+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"

+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.32.0"
@@ -5608,6 +5668,12 @@ version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"

+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
 [[package]]
 name = "winnow"
 version = "0.4.1"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ name = "deltachat"
 version = "1.114.0"
 edition = "2021"
 license = "MPL-2.0"
-rust-version = "1.68"
+rust-version = "1.65"

 [profile.dev]
 debug = 0
@@ -88,7 +88,7 @@ tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] }
 tokio-io-timeout = "1.2.0"
 tokio-stream = { version = "0.1.14", features = ["fs"] }
 tokio-tar = { version = "0.3" } # TODO: integrate tokio into async-tar
-tokio-util = "0.7.7"
+tokio-util = "0.7.8"
 toml = "0.7"
 trust-dns-resolver = "0.22"
 url = "2"
--- a/cliff.toml
+++ b/cliff.toml
@@ -0,0 +1,75 @@
+# configuration file for git-cliff
+# see https://github.com/orhun/git-cliff#configuration-file
+
+
+[git]
+# parse the commits based on https://www.conventionalcommits.org
+conventional_commits = true
+# filter out the commits that are not conventional
+filter_unconventional = true
+# process each line of a commit as an individual commit
+split_commits = false
+# regex for preprocessing the commit messages
+commit_preprocessors = [
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/deltachat/deltachat-core-rust/PR/${2}))"}, # replace pull request / issue numbers
+]
+# regex for parsing and grouping commits
+commit_parsers = [
+    { message = "^feat", group = "Features / Changes"},
+    { message = "^fix", group = "Fixes"},
+    { message = "^api", group = "API-Changes" },
+    { message = "^refactor", group = "Refactor"},
+    { message = "^perf", group = "Performance"},
+    { message = "^test", group = "Tests"},
+    { message = "^style", group = "Styling"},
+    { message = "^chore\\(release\\): prepare for", skip = true},
+    { message = "^chore", group = "Miscellaneous Tasks"},
+#    { body = ".*security", group = "Security"},
+]
+# protect breaking changes from being skipped due to matching a skipping commit_parser
+protect_breaking_commits = true
+# filter out the commits that are not matched by commit parsers
+filter_commits = true
+# glob pattern for matching git tags
+tag_pattern = "v[0-9]*"
+# regex for skipping tags
+#skip_tags = "v0.1.0-beta.1"
+# regex for ignoring tags
+ignore_tags = ""
+# sort the tags topologically
+topo_order = false
+# sort the commits inside sections by oldest/newest order
+sort_commits = "oldest"
+# limit the number of commits included in the changelog.
+# limit_commits = 42
+
+
+[changelog]
+# changelog header
+header = """
+# Changelog\n
+"""
+# template for the changelog body
+# https://tera.netlify.app/docs/#introduction
+body = """
+{% if version %}\
+    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
+{% else %}\
+    ## [unreleased]
+{% endif %}\
+{% for group, commits in commits | group_by(attribute="group") %}
+    ### {{ group | upper_first }}
+    {% for commit in commits %}
+        - {% if commit.breaking %}[**breaking**] {% endif %}{{ commit.message | upper_first }}\
+	{% for footer in commit.footers %}{% if 'BREAKING CHANGE' in footer.token %}
+	  {% raw %}  {% endraw %}- {{ footer.value }}\
+	{% endif %}{% endfor %}\
+    {% endfor %}
+{% endfor %}\n
+"""
+# remove the leading and trailing whitespace from the template
+trim = true
+# changelog footer
+footer = """
+<!-- generated by git-cliff -->
+"""
--- a/deltachat-jsonrpc/Cargo.toml
+++ b/deltachat-jsonrpc/Cargo.toml
@@ -23,17 +23,17 @@ futures = { version = "0.3.28" }
 serde_json = "1.0.96"
 yerpc = { version = "0.4.3", features = ["anyhow_expose"] }
 typescript-type-def = { version = "0.5.5", features = ["json_value"] }
-tokio = { version = "1.27.0" }
+tokio = { version = "1.28.0" }
 sanitize-filename = "0.4"
 walkdir = "2.3.3"
 base64 = "0.21"

 # optional dependencies
-axum = { version = "0.6.12", optional = true, features = ["ws"] }
+axum = { version = "0.6.18", optional = true, features = ["ws"] }
 env_logger = { version = "0.10.0", optional = true }

 [dev-dependencies]
-tokio = { version = "1.27.0", features = ["full", "rt-multi-thread"] }
+tokio = { version = "1.28.0", features = ["full", "rt-multi-thread"] }


 [features]
--- a/deltachat-jsonrpc/src/api/mod.rs
+++ b/deltachat-jsonrpc/src/api/mod.rs
@@ -24,7 +24,7 @@ use deltachat::{
    provider::get_provider_info,
    qr,
    qr_code_generator::{generate_backup_qr, get_securejoin_qr_svg},
-    reaction::send_reaction,
+    reaction::{get_msg_reactions, send_reaction},
    securejoin,
    stock_str::StockMessage,
    webxdc::StatusUpdateSerial,
@@ -46,6 +46,7 @@ use types::http::HttpResponse;
 use types::message::MessageData;
 use types::message::MessageObject;
 use types::provider_info::ProviderInfo;
+use types::reactions::JSONRPCReactions;
 use types::webxdc::WebxdcMessageInfo;

 use self::events::Event;
@@ -1721,6 +1722,21 @@ impl CommandApi {
        Ok(message_id.to_u32())
    }

+    /// Returns reactions to the message.
+    async fn get_message_reactions(
+        &self,
+        account_id: u32,
+        message_id: u32,
+    ) -> Result<Option<JSONRPCReactions>> {
+        let ctx = self.get_context(account_id).await?;
+        let reactions = get_msg_reactions(&ctx, MsgId::new(message_id)).await?;
+        if reactions.is_empty() {
+            Ok(None)
+        } else {
+            Ok(Some(reactions.into()))
+        }
+    }
+
    async fn send_msg(&self, account_id: u32, chat_id: u32, data: MessageData) -> Result<u32> {
        let ctx = self.get_context(account_id).await?;
        let mut message = Message::new(if let Some(viewtype) = data.viewtype {
--- a/deltachat-rpc-client/src/deltachat_rpc_client/message.py
+++ b/deltachat-rpc-client/src/deltachat_rpc_client/message.py
@@ -1,6 +1,6 @@
 import json
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, Optional, Union

 from ._utils import AttrDict
 from .contact import Contact
@@ -35,6 +35,13 @@ class Message:
        snapshot["message"] = self
        return snapshot

+    async def get_reactions(self) -> Optional[AttrDict]:
+        """Get message reactions."""
+        reactions = await self._rpc.get_message_reactions(self.account.id, self.id)
+        if reactions:
+            return AttrDict(reactions)
+        return None
+
    async def mark_seen(self) -> None:
        """Mark the message as seen."""
        await self._rpc.markseen_msgs(self.account.id, [self.id])
--- a/deltachat-rpc-client/tests/test_something.py
+++ b/deltachat-rpc-client/tests/test_something.py
@@ -239,6 +239,10 @@ async def test_message(acfactory) -> None:

    await message.mark_seen()
    await message.send_reaction("😎")
+    reactions = await message.get_reactions()
+    assert reactions
+    snapshot = await message.get_snapshot()
+    assert reactions == snapshot.reactions


@pytest.mark.asyncio()
--- a/deltachat-rpc-server/Cargo.toml
+++ b/deltachat-rpc-server/Cargo.toml
@@ -19,8 +19,8 @@ futures-lite = "1.13.0"
 log = "0.4"
 serde_json = "1.0.96"
 serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.27.0", features = ["io-std"] }
-tokio-util = "0.7.7"
+tokio = { version = "1.28.0", features = ["io-std"] }
+tokio-util = "0.7.8"
 yerpc = { version = "0.4.0", features = ["anyhow_expose"] }

 [features]
--- a/deny.toml
+++ b/deny.toml
@@ -49,12 +49,15 @@ skip = [
     { name = "syn", version = "1.0.109" },
     { name = "time", version = "<0.3" },
     { name = "wasi", version = "<0.11" },
-     { name = "windows_aarch64_msvc", version = "<0.42" },
-     { name = "windows_i686_gnu", version = "<0.42" },
-     { name = "windows_i686_msvc", version = "<0.42" },
-     { name = "windows-sys", version = "<0.45" },
-     { name = "windows_x86_64_gnu", version = "<0.42" },
-     { name = "windows_x86_64_msvc", version = "<0.42" },
+     { name = "windows_aarch64_gnullvm", version = "<0.48" },
+     { name = "windows_aarch64_msvc", version = "<0.48" },
+     { name = "windows_i686_gnu", version = "<0.48" },
+     { name = "windows_i686_msvc", version = "<0.48" },
+     { name = "windows-sys", version = "<0.48" },
+     { name = "windows-targets", version = "<0.48" },
+     { name = "windows_x86_64_gnullvm", version = "<0.48" },
+     { name = "windows_x86_64_gnu", version = "<0.48" },
+     { name = "windows_x86_64_msvc", version = "<0.48" },
 ]


--- a/scripts/deny.sh
+++ b/scripts/deny.sh
@@ -1,2 +1,6 @@
 #!/bin/sh
+
+# Update package cache without changing the lockfile.
+cargo update --dry-run
+
 cargo deny --workspace --all-features check -D warnings
--- a/scripts/release.py
+++ b/scripts/release.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+
+import sys
+import subprocess
+import set_core_version
+from argparse import ArgumentParser
+
+
+# update the version
+parser = ArgumentParser(prog="release")
+parser.add_argument("newversion")
+
+try:
+    newversion = parser.parse_args().newversion
+except SystemExit:
+    newversion = None
+set_core_version.set_version(newversion)
+
+tag = "v" + newversion
+
+# TODO would be nice to automatically checkout the correct branch
+
+# update the changelog
+print(f"Updating CHANGELOG.md using git cliff --unreleased --tag {newversion} --prepend CHANGELOG.md")
+changelog = subprocess.run(["git", "cliff", "--unreleased", "--tag", newversion, "--prepend", "CHANGELOG.md"]).stdout.strip()
+subprocess.run(["git", "add", "-A"])
+subprocess.run(["git", "commit", "-m", f"chore(release): prepare for {tag}"])
+subprocess.run(["git", "show"])
+
+# create a tag
+subprocess.run(
+    [
+        "git", "tag", "-a", tag, "-m", f"Release {tag}", "-m", changelog
+    ]
+)
+subprocess.run(["git", "tag", "-v", tag])
+
+print("Done!")
+print(f"Now push the commit (git push origin {tag}).")
--- a/scripts/set_core_version.py
+++ b/scripts/set_core_version.py
@@ -9,7 +9,14 @@ import subprocess
 from argparse import ArgumentParser

 rex = re.compile(r'version = "(\S+)"')
-
+json_list = ["package.json", "deltachat-jsonrpc/typescript/package.json"]
+toml_list = [
+    "Cargo.toml",
+    "deltachat-ffi/Cargo.toml",
+    "deltachat-jsonrpc/Cargo.toml",
+    "deltachat-rpc-server/Cargo.toml",
+    "deltachat-repl/Cargo.toml",
+]

 def regex_matches(relpath, regex=rex):
    p = pathlib.Path(relpath)
@@ -60,31 +67,16 @@ def update_package_json(relpath, newversion):
        json.dump(json_data, f, sort_keys=True, indent=2)
        f.write("\n")

-
-def main():
-    parser = ArgumentParser(prog="set_core_version")
-    parser.add_argument("newversion")
-
-    json_list = ["package.json", "deltachat-jsonrpc/typescript/package.json"]
-    toml_list = [
-        "Cargo.toml",
-        "deltachat-ffi/Cargo.toml",
-        "deltachat-jsonrpc/Cargo.toml",
-        "deltachat-rpc-server/Cargo.toml",
-        "deltachat-repl/Cargo.toml",
-    ]
-    try:
-        opts = parser.parse_args()
-    except SystemExit:
+def set_version(newversion):
+    if newversion is None:
        print()
        for x in toml_list:
            print(f"{x}: {read_toml_version(x)}")
        for x in json_list:
            print(f"{x}: {read_json_version(x)}")
        print()
-        raise SystemExit("need argument: new version, example: 1.25.0")
+        raise SystemExit("need argument: newversion, example: 1.25.0")

-    newversion = opts.newversion
    if newversion.count(".") < 2:
        raise SystemExit("need at least two dots in version")

@@ -134,6 +126,17 @@ def main():
    print(f"   git push origin v{newversion}")
    print("")

+def main():
+    parser = ArgumentParser(prog="set_core_version")
+    parser.add_argument("newversion")
+
+    try:
+        newversion = parser.parse_args().newversion
+    except SystemExit:
+        newversion = None
+
+    set_version(newversion)
+

 if __name__ == "__main__":
    main()
--- a/src/html.rs
+++ b/src/html.rs
@@ -7,6 +7,7 @@
 //! `MsgId.get_html()` will return HTML -
 //! this allows nice quoting, handling linebreaks properly etc.

+
 use std::future::Future;
 use std::pin::Pin;

--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -557,7 +557,13 @@ async fn add_parts(
                blocked: Blocked::Request,
            }) if is_bot => Blocked::Not,
            Some(ChatIdBlocked { id: _, blocked }) => blocked,
-            None => Blocked::Request,
+            None => {
+                if is_bot {
+                    Blocked::Not
+                } else {
+                    Blocked::Request
+                }
+            }
        };

        if chat_id.is_none() {
--- a/src/receive_imf/tests.rs
+++ b/src/receive_imf/tests.rs
@@ -2980,6 +2980,17 @@ async fn test_auto_accept_for_bots() -> Result<()> {
    Ok(())
 }

+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn test_auto_accept_group_for_bots() -> Result<()> {
+    let t = TestContext::new_alice().await;
+    t.set_config(Config::Bot, Some("1")).await.unwrap();
+    receive_imf(&t, GRP_MAIL, false).await?;
+    let msg = t.get_last_msg().await;
+    let chat = chat::Chat::load_from_db(&t, msg.chat_id).await?;
+    assert!(!chat.is_contact_request());
+    Ok(())
+}
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_no_private_reply_to_blocked_account() -> Result<()> {
    let mut tcm = TestContextManager::new();
Author	SHA1	Message	Date
Hocuri	8d4af85cb1	Filter unconventional commits, they cluttered the changelog too much	2023-05-06 19:22:10 +02:00
Hocuri	f637278cb1	Make PR references clickable	2023-05-06 18:44:35 +02:00
Hocuri	a202771d36	Improve template: Always include lines that start with 'BREAKING CHANGE'	2023-05-06 18:41:48 +02:00
Hocuri	833d30123c	feat: Commmmmmit BREAKING CHANGE: this breaks everything	2023-05-06 17:47:16 +02:00
Hocuri	b6c0b5b66e	Rename mergable check to "Conventional Commits"	2023-05-06 15:30:52 +02:00
Hocuri	f30a1a3865	chore: Add git-cliff as a changelog generation tool Changelogs will be generated using commit messages by `scripts/release.py`. Both the commit message and the PR title should follow https://conventionalcommits.org. E.g. start with 'feat:' (for Features / Changes), 'fix:' (for Fixes), 'api:' (for API-Changes), 'api!:' for breaking API-Changes) 'refactor:' (for Refactor), 'perf:' (for Performance), 'test:' (for Tests), 'style:' (for Styling), 'chore:' (for Miscellaneous Tasks)	2023-05-06 15:20:58 +02:00
dependabot[bot]	3a25d6a44e	Merge pull request #4362 from deltachat/dependabot/cargo/human-panic-1.1.4	2023-05-06 11:35:30 +00:00
dependabot[bot]	0688895022	Merge pull request #4360 from deltachat/dependabot/cargo/axum-0.6.18	2023-05-05 21:35:26 +00:00
dependabot[bot]	ce0e5416e6	cargo: bump human-panic from 1.1.3 to 1.1.4 Bumps [human-panic](https://github.com/rust-cli/human-panic) from 1.1.3 to 1.1.4. - [Release notes](https://github.com/rust-cli/human-panic/releases) - [Changelog](https://github.com/rust-cli/human-panic/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-cli/human-panic/compare/v1.1.3...v1.1.4) --- updated-dependencies: - dependency-name: human-panic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-05 21:24:47 +00:00
link2xt	7918a6801e	scripts/deny.sh: update package cache before running `cargo deny`	2023-05-05 21:23:10 +00:00
link2xt	6af631e8df	Add JSON-RPC API to get reactions	2023-05-05 20:49:55 +00:00
dependabot[bot]	625ecaa9b5	cargo: bump axum from 0.6.12 to 0.6.18 Bumps [axum](https://github.com/tokio-rs/axum) from 0.6.12 to 0.6.18. - [Release notes](https://github.com/tokio-rs/axum/releases) - [Changelog](https://github.com/tokio-rs/axum/blob/main/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/axum/compare/axum-v0.6.12...axum-v0.6.18) --- updated-dependencies: - dependency-name: axum dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-05 20:31:03 +00:00
dependabot[bot]	24fe1b9c15	Merge pull request #4364 from deltachat/dependabot/cargo/tokio-1.28.0	2023-05-05 20:29:57 +00:00
link2xt	ba36d09c70	Make the bots automatically accept group chat contact requests	2023-05-05 16:37:34 +00:00
link2xt	f57be7187e	Update deny.toml	2023-05-05 13:23:44 +00:00
dependabot[bot]	6a00338f79	cargo: bump tokio from 1.27.0 to 1.28.0 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.27.0 to 1.28.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.27.0...tokio-1.28.0) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-05 10:48:24 +00:00
dependabot[bot]	16906210e1	Merge pull request #4354 from deltachat/dependabot/cargo/tokio-util-0.7.8	2023-05-05 10:47:12 +00:00
dependabot[bot]	f9b4540387	Merge pull request #4358 from deltachat/dependabot/cargo/syn-2.0.15	2023-05-05 10:46:48 +00:00
dependabot[bot]	9755438d0d	Merge pull request #4366 from deltachat/dependabot/cargo/serde-1.0.160	2023-05-05 10:44:58 +00:00
dependabot[bot]	fe9534ed7d	cargo: bump serde from 1.0.159 to 1.0.160 Bumps [serde](https://github.com/serde-rs/serde) from 1.0.159 to 1.0.160. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.159...v1.0.160) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-03 10:55:01 +00:00
dependabot[bot]	134c9ada68	cargo: bump syn from 2.0.13 to 2.0.15 Bumps [syn](https://github.com/dtolnay/syn) from 2.0.13 to 2.0.15. - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.13...2.0.15) --- updated-dependencies: - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-03 10:54:57 +00:00
dependabot[bot]	a3240452ff	cargo: bump tokio-util from 0.7.7 to 0.7.8 Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.7.7 to 0.7.8. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-util-0.7.7...tokio-util-0.7.8) --- updated-dependencies: - dependency-name: tokio-util dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-05-03 10:54:42 +00:00