Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master branch #4874

Merged
merged 142 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
243c035
chore: spellcheck
link2xt Jul 7, 2023
9cd000c
feat: Verified 1:1 chats (#4315)
Hocuri Jul 9, 2023
d2b15cb
docs: document how logs and error messages should be formatted
link2xt Jul 8, 2023
31e3169
chore: nightly clippy fixes
link2xt Jul 10, 2023
976797d
build: remove examples/simple.rs
link2xt Jul 10, 2023
17f2d33
test: Remove unnecessary inner_set_protection() call (#4539)
Hocuri Jul 11, 2023
1e28ea9
fix: Don't create 1:1 chat as protected for contact who doesn't prefe…
Hocuri Jul 11, 2023
a020d5c
Merge branch 'stable'
link2xt Jul 14, 2023
d762753
fix: Allow to save a draft if the verification is broken (#4542)
Hocuri Jul 16, 2023
6d37e86
Merge branch 'stable'
link2xt Jul 17, 2023
3de1dbc
chore(deps): update dependencies
link2xt Jul 19, 2023
a1663a9
build: use Rust 1.71.0 and increase MSRV to 1.66.0
link2xt Jul 19, 2023
659cffe
ci: remove comment about python from rust tests
link2xt Jul 19, 2023
7062bb0
clarify transitive behaviour of dc_contact_is_verfified()
r10s Jul 18, 2023
5673294
api(jsonrpc): add resend_messages
Simon-Laux Jul 22, 2023
b8fcb66
cargo fmt
Simon-Laux Jul 22, 2023
3705616
Merge branch 'stable'
link2xt Jul 23, 2023
3a63628
update node constants
Simon-Laux Jul 22, 2023
682e241
fix: Fix info-message orderings of verified 1:1 chats (#4545)
Hocuri Jul 24, 2023
b96028c
api!(Rust): Remove unused function is_verified_ex() (#4551)
Hocuri Jul 24, 2023
8fb8a87
chore(deps): update dependencies
link2xt Jul 24, 2023
acc7bb0
chore(deps): update rPGP
link2xt Jul 24, 2023
d797de7
refactor: use slices and vectors instead of Keyring wrapper
link2xt Jul 24, 2023
f930576
Merge branch 'stable'
link2xt Jul 24, 2023
170968d
Update README.md
Hocuri Jul 25, 2023
6d51d19
refactor(e2ee): do not return anything from ensure_secret_key_exists()
link2xt Jul 24, 2023
f27d304
feat!: Add lockfile to account manager (#4310)
iequidoo Apr 10, 2023
c55a3d3
refactor: flatten and simplify imports
link2xt Jul 27, 2023
9b9703a
refactor: replace DcKey.load_self trait method with functions
link2xt Jul 27, 2023
67f28f5
Merge branch 'stable'
link2xt Jul 27, 2023
a02a593
fix example; this was changed some time ago, see https://docs.webxdc.…
r10s Jul 28, 2023
85739ba
refactor: make last_added_location_id an Option
link2xt Jul 28, 2023
b784415
refactor: move dc_preconfigure_keypair() implementation into `deltach…
link2xt Jul 29, 2023
af01355
refactor: hide DcSecretKey trait from the API
link2xt Jul 29, 2023
60bacbe
feat: Don't show a contact as verified if their key changed since the…
Hocuri Jul 31, 2023
8ed6d4d
api!: make `MsgId.delete_from_db()` private
link2xt Jul 23, 2023
8eee389
refactor: use SQL transaction in MsgId.delete_from_db()
link2xt Jul 23, 2023
c34edc5
test: test that get_system_info() works over RPC backup import
link2xt Jul 31, 2023
13e766b
feat(deltachat-rpc-server): add --openrpc option
link2xt Aug 1, 2023
d95843b
chore(deps): update dependencies
link2xt Aug 2, 2023
70000d9
build: increase MSRV to 1.67.0
link2xt Aug 2, 2023
e6cffd5
refactor: remove Chattype::Undefined
link2xt Jul 31, 2023
3111bcd
refactor: flatten imports in deltachat-jsonrpc
link2xt Aug 3, 2023
aecbebd
docs: improve JSON-RPC API documentation
link2xt Aug 3, 2023
954067e
Merge tag 'v1.119.0'
link2xt Aug 3, 2023
e12044e
api!(deltachat-jsonrpc): use `kind` as a tag for all union types
link2xt Aug 3, 2023
3ab181f
build: update to Zig 0.11.0
link2xt Aug 4, 2023
885f26e
test: Directly unwrap in TestContext::get_chat() (#4614)
Hocuri Aug 8, 2023
53f04a1
test: Don't accidentally accept that a chat protection is broken (#4550)
Hocuri Aug 8, 2023
03395b9
chore(cargo): bump quick-xml from 0.29.0 to 0.30.0
dependabot[bot] Aug 1, 2023
20c8874
test: W/a message reordering in test_reaction_to_partially_fetched_msg()
iequidoo Aug 8, 2023
987ce58
chore(python): fix lint errors
link2xt Aug 11, 2023
3b47c3f
ci: Run Rust tests with RUST_BACKTRACE set
iequidoo Aug 11, 2023
16aad3f
build(cargo-deny): ignore RUSTSEC-2022-0093
link2xt Aug 17, 2023
9094df7
build(python): pin `sphinx` to 7.1.2
link2xt Aug 23, 2023
488a3d1
build(deny): ignore RUSTSEC-2023-0052
link2xt Aug 23, 2023
8f2313b
test: test_openrpc_command_line: Check that deltachat-rpc-server exis…
iequidoo Aug 21, 2023
0179ec2
fix: receive_imf: Update peerstate from db after handling Securejoin …
iequidoo Aug 16, 2023
95b2a15
fix: Sort old incoming messages below all outgoing ones (#4621)
iequidoo Aug 17, 2023
a66f8bd
fix: Delete messages from SMTP queue only on user demand (#4579)
iequidoo Aug 9, 2023
8c778b3
test: extend `test_qr_join_chat` to check that the group is not verified
link2xt Aug 24, 2023
7676473
fix: do not mark non-verified group chats as verified when using secu…
link2xt Aug 24, 2023
94cd9a7
chore(cargo): bump sanitize-filename from 0.4.0 to 0.5.0
dependabot[bot] Aug 24, 2023
c857d6e
Merge pull request #4591 from deltachat/dependabot/cargo/sanitize-fil…
dependabot[bot] Aug 24, 2023
3b80632
Merge branch 'stable'
link2xt Aug 24, 2023
2051347
Merge branch 'stable'
link2xt Aug 25, 2023
95f29f7
fix: receive_imf: Set protection only for Chattype::Single (#4597)
iequidoo Aug 24, 2023
5e3b1fa
Merge branch 'stable'
link2xt Aug 26, 2023
a520f02
chore: rustfmt
link2xt Aug 26, 2023
e59c4ee
Merge branch 'stable'
link2xt Aug 27, 2023
9a7d1fa
Merge tag 'v1.120.0'
link2xt Aug 28, 2023
83ef25e
fix: Return from dc_get_chatlist(DC_GCL_FOR_FORWARDING) only chats wh…
iequidoo Aug 11, 2023
bc80236
Merge commit '7c7cd9cc8084f0e425b1919b84d5e79ed150d16b~' into HEAD
iequidoo Sep 1, 2023
5e5e557
Merge branch 'stable'
iequidoo Sep 1, 2023
60ddbe5
chore(cargo): bump strum_macros from 0.25.1 to 0.25.2
dependabot[bot] Sep 1, 2023
6881f9d
chore(cargo): bump syn from 2.0.28 to 2.0.29
dependabot[bot] Sep 1, 2023
88ae653
chore(cargo): bump chrono from 0.4.26 to 0.4.28
dependabot[bot] Sep 1, 2023
99302c9
chore(cargo): bump base64 from 0.21.2 to 0.21.3
dependabot[bot] Sep 1, 2023
cb0270b
chore(cargo): bump anyhow from 1.0.72 to 1.0.75
dependabot[bot] Sep 1, 2023
2a39a85
chore(cargo): bump thiserror from 1.0.44 to 1.0.47
dependabot[bot] Sep 1, 2023
aebad2e
chore(cargo): bump url from 2.4.0 to 2.4.1
dependabot[bot] Sep 1, 2023
ab09ecc
chore(cargo): bump schemars from 0.8.12 to 0.8.13
dependabot[bot] Sep 1, 2023
828c90a
chore(cargo): bump tokio from 1.29.1 to 1.32.0
dependabot[bot] Sep 1, 2023
486050d
chore(cargo): bump backtrace from 0.3.68 to 0.3.69
dependabot[bot] Sep 2, 2023
d9e3828
chore(cargo): bump image from 0.24.6 to 0.24.7
dependabot[bot] Sep 1, 2023
e1f1143
chore(cargo): bump quote from 1.0.32 to 1.0.33
dependabot[bot] Sep 2, 2023
8ac1754
chore(cargo): bump tempfile from 3.7.0 to 3.8.0
dependabot[bot] Sep 2, 2023
d8bf1c1
chore(cargo): bump reqwest from 0.11.18 to 0.11.20
dependabot[bot] Sep 1, 2023
ec56134
Remove `winreg` entry from deny.toml
link2xt Sep 2, 2023
0a4c993
chore(cargo): bump serde_json from 1.0.104 to 1.0.105
dependabot[bot] Sep 2, 2023
72c94e1
chore(cargo): bump serde from 1.0.180 to 1.0.188
dependabot[bot] Sep 3, 2023
1b883ae
chore(cargo): bump typescript-type-def from 0.5.7 to 0.5.8
dependabot[bot] Sep 3, 2023
b36acb2
chore(cargo): bump log from 0.4.19 to 0.4.20
dependabot[bot] Sep 3, 2023
e12ef80
Merge pull request #4675 from deltachat/dependabot/cargo/backtrace-0.…
dependabot[bot] Sep 3, 2023
ae939e7
Merge remote-tracking branch 'origin/stable'
Hocuri Sep 4, 2023
54d632a
chore(cargo): bump axum from 0.6.19 to 0.6.20
dependabot[bot] Sep 2, 2023
178fc17
chore(cargo): bump trust-dns-resolver from 0.22.0 to 0.23.0
dependabot[bot] Sep 1, 2023
e9811fb
AsyncResolver::tokio does not return a Result anymore
link2xt Sep 2, 2023
f94d34c
chore: remove idna from deny.toml
link2xt Sep 3, 2023
f05b0dd
chore(cargo): bump regex from 1.9.1 to 1.9.5
dependabot[bot] Sep 4, 2023
4815e9b
Merge pull request #4680 from deltachat/dependabot/cargo/regex-1.9.5
dependabot[bot] Sep 5, 2023
2587ebb
fix: Clear VerifiedOneOnOneChats config on backup (#4681)
Hocuri Sep 5, 2023
f7a47e6
Merge pull request #4664 from deltachat/dependabot/cargo/strum_macros…
dependabot[bot] Sep 5, 2023
dcbf599
Merge tag 'v1.121.0'
link2xt Sep 6, 2023
4a05854
chore(cargo): bump webpki from 0.22.0 to 0.22.1
link2xt Sep 8, 2023
790e867
Merge tag 'v1.122.0'
link2xt Sep 12, 2023
e7617f0
build(coredeps): install perl-IPC-Cmd
link2xt Sep 12, 2023
061d091
build(coredeps): only run `yum` if it is available
link2xt Sep 12, 2023
a42a6ca
chore(deps): bump quinn-proto from 0.9.2 to 0.9.5 in /fuzz
dependabot[bot] Sep 21, 2023
59a3bc0
Merge tag 'v1.123.0'
link2xt Sep 22, 2023
c416875
Merge pull request #4742 from deltachat/dependabot/cargo/fuzz/quinn-p…
dependabot[bot] Sep 22, 2023
d109a1b
Fix link to the template documentation of git-cliff
Hocuri Sep 29, 2023
5daa627
Merge stable into master
link2xt Sep 30, 2023
59e5a63
Merge branch 'stable', resolving conflicts
link2xt Oct 1, 2023
e500485
chore(cargo): bump brotli from 3.3.4 to 3.4.0
dependabot[bot] Oct 1, 2023
3166b44
chore(cargo): bump tokio-util from 0.7.8 to 0.7.9
dependabot[bot] Oct 1, 2023
6b2df13
chore(cargo): bump thiserror from 1.0.47 to 1.0.49
dependabot[bot] Oct 1, 2023
573746c
chore(cargo): bump regex from 1.9.5 to 1.9.6
dependabot[bot] Oct 1, 2023
e4e50d0
chore(cargo): bump smallvec from 1.11.0 to 1.11.1
dependabot[bot] Oct 1, 2023
c0195ab
chore(cargo): bump sha2 from 0.10.7 to 0.10.8
dependabot[bot] Oct 1, 2023
c2d7011
Merge pull request #4772 from deltachat/dependabot/cargo/smallvec-1.11.1
dependabot[bot] Oct 2, 2023
4a6a214
Merge pull request #4769 from deltachat/dependabot/cargo/tokio-util-0…
dependabot[bot] Oct 2, 2023
2ae92c0
Merge pull request #4771 from deltachat/dependabot/cargo/regex-1.9.6
dependabot[bot] Oct 2, 2023
8bc2ce1
chore(deps): bump webpki from 0.22.0 to 0.22.2 in /fuzz
dependabot[bot] Oct 2, 2023
1f03267
Merge pull request #4773 from deltachat/dependabot/cargo/sha2-0.10.8
dependabot[bot] Oct 3, 2023
883832f
Merge pull request #4768 from deltachat/dependabot/cargo/brotli-3.4.0
dependabot[bot] Oct 3, 2023
ef3e94c
Merge pull request #4777 from deltachat/dependabot/cargo/fuzz/webpki-…
dependabot[bot] Oct 3, 2023
24ea90b
Merge pull request #4770 from deltachat/dependabot/cargo/thiserror-1.…
dependabot[bot] Oct 3, 2023
f3fb0dc
chore(cargo): bump proptest from 1.2.0 to 1.3.1
dependabot[bot] Oct 1, 2023
2757915
Merge tag 'v1.124.0'
link2xt Oct 4, 2023
a119b24
Merge tag 'v1.124.1'
link2xt Oct 5, 2023
37383c1
Merge 'stable' into 'master'
link2xt Oct 8, 2023
2775fd1
Merge tag 'v1.125.0'
link2xt Oct 14, 2023
0751cc5
api(json-rpc): force stickers to be sent as stickers (#4819)
Septias Oct 14, 2023
1632035
feat: add bot field to contact (#4821)
Septias Oct 15, 2023
e87f785
test: adjust expected info message in test_verified_group_vs_delete_s…
link2xt Oct 21, 2023
54410db
Merge tag 'v1.126.0'
link2xt Oct 22, 2023
c1eb33c
Merge tag 'v1.126.1'
link2xt Oct 24, 2023
4e771e8
Merge branch 'stable'
link2xt Oct 24, 2023
3748794
fix(sql): order migrations the same as on stable branch
link2xt Oct 25, 2023
b89c134
Merge branch 'master' into stable
link2xt Oct 25, 2023
113356a
docs: fix CI badge URL in the readme
link2xt Oct 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ jobs:
uses: swatinem/rust-cache@v2

- name: Tests
env:
RUST_BACKTRACE: 1
run: cargo test --workspace

- name: Test cargo vendor
Expand Down
23 changes: 23 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,29 @@ If you have multiple changes in one PR, create multiple conventional commits, an
[Conventional Commits]: https://www.conventionalcommits.org/
[git-cliff]: https://git-cliff.org/

### Errors

Delta Chat core mostly uses [`anyhow`](https://docs.rs/anyhow/) errors.
When using [`Context`](https://docs.rs/anyhow/latest/anyhow/trait.Context.html),
capitalize it but do not add a full stop as the contexts will be separated by `:`.
For example:
```
.with_context(|| format!("Unable to trash message {msg_id}"))
```

### Logging

For logging, use `info!`, `warn!` and `error!` macros.
Log messages should be capitalized and have a full stop in the end. For example:
```
info!(context, "Ignoring addition of {added_addr:?} to {chat_id}.");
```

Format anyhow errors with `{:#}` to print all the contexts like this:
```
error!(context, "Failed to set selfavatar timestamp: {err:#}.");
```

### Reviewing

Once a PR has an approval and passes CI, it can be merged.
Expand Down
Loading
Loading