Import upstream v1.0.14 #59

Merged
jcoffey-dev merged 3 commits from import/upstream-v1.0.14 into main 2026-11-04 03:16:26 +00:00
Owner

For #58. Merges upstream v1.0.14 the way scripts/upstream-import.py describes. Needs a real merge, not a squash, and upstream gets pushed once this lands. #58 closes after that.

Comes in

  • Google Takeout: Portuguese (Brazil) system labels map to mailbox roles and keywords, or are dropped, like the English ones.
  • Google Takeout: a message labeled neither Opened nor Unread imports as read.
  • Google Takeout: a contact without a UID is stored once rather than once per contact group file. Archives from an earlier version keep the old copies, so re-import into a fresh archive.
  • ureq 3.4.2 to 3.5.1 and rustls 0.23.45 to 0.23.46.

Left out

  • Upstream's HTTP timeouts (io_timeout, apply_timeouts, silent_server_times_out). net::with_timeouts already covers these clients, so the four HTTP client conflicts keep main's side.
  • Upstream's Dockerfile and .dockerignore, now in DROPPED. Nothing here builds them, and the base image isn't pinned.
  • Upstream's README additions, as usual for a file the fork owns.

To decide before merging

  1. Only English and Portuguese (Brazil) labels are recognized, so a Takeout in any other language imports its unread mail as read, and the unread label becomes a folder. Before this change, the same archive imported everything as unread. Neither is right. The changelog says so, and unread_label_in_another_language_is_not_recognized records it.
  2. Upstream's 5-minute per-read timeout isn't taken, so a stalled body can still wait up to RECV_BODY (30 minutes) before it's abandoned and retried. A silent server is already caught by RECV_RESPONSE. This could be a small follow-up on with_timeouts.

Checked

  • cargo test --locked: 1604 passed, 0 failed, 71 ignored. cargo fmt --check is clean.
  • The #[ignore]d live-server tests were not run.
  • Upstream's added lines and this branch's diff scanned clean for hidden characters and text aimed at automated tools.
For #58. Merges upstream v1.0.14 the way `scripts/upstream-import.py` describes. Needs a real merge, not a squash, and `upstream` gets pushed once this lands. #58 closes after that. **Comes in** - Google Takeout: Portuguese (Brazil) system labels map to mailbox roles and keywords, or are dropped, like the English ones. - Google Takeout: a message labeled neither `Opened` nor `Unread` imports as read. - Google Takeout: a contact without a `UID` is stored once rather than once per contact group file. Archives from an earlier version keep the old copies, so re-import into a fresh archive. - ureq 3.4.2 to 3.5.1 and rustls 0.23.45 to 0.23.46. **Left out** - Upstream's HTTP timeouts (`io_timeout`, `apply_timeouts`, `silent_server_times_out`). `net::with_timeouts` already covers these clients, so the four HTTP client conflicts keep main's side. - Upstream's Dockerfile and `.dockerignore`, now in `DROPPED`. Nothing here builds them, and the base image isn't pinned. - Upstream's README additions, as usual for a file the fork owns. **To decide before merging** 1. Only English and Portuguese (Brazil) labels are recognized, so a Takeout in any other language imports its unread mail as read, and the unread label becomes a folder. Before this change, the same archive imported everything as unread. Neither is right. The changelog says so, and `unread_label_in_another_language_is_not_recognized` records it. 2. Upstream's 5-minute per-read timeout isn't taken, so a stalled body can still wait up to `RECV_BODY` (30 minutes) before it's abandoned and retried. A silent server is already caught by `RECV_RESPONSE`. This could be a small follow-up on `with_timeouts`. **Checked** - `cargo test --locked`: 1604 passed, 0 failed, 71 ignored. `cargo fmt --check` is clean. - The `#[ignore]`d live-server tests were not run. - Upstream's added lines and this branch's diff scanned clean for hidden characters and text aimed at automated tools.
jcoffey-dev added 3 commits 2026-11-04 03:06:57 +00:00
Nothing here builds it and its base image isn't pinned. The fork ships release binaries, and inbuxa-server pins those by hash.
Upstream commit 033d2059caf2733ce6c0916b81e24b3dee54887b, renamed by scripts/upstream-import.py.
Merge upstream v1.0.14
github/ci (branch) GitHub Actions
ci / test (pull_request) Skipped
ci / github (pull_request) Successful in 12s
ci / announce (pull_request) Skipped
9f9096ebdf
Takes upstream's Google Takeout fixes and its ureq bump. Upstream's HTTP timeouts are left out, because main already has its own in net::with_timeouts. Its silent_server_times_out test needed those, so it goes too. A new test records that unread labels outside English and Portuguese (Brazil) aren't recognized.
jcoffey-dev merged commit 18fca1b631 into main 2026-11-04 03:16:26 +00:00
jcoffey-dev deleted branch import/upstream-v1.0.14 2026-11-04 03:16:27 +00:00
Sign in to join this conversation.