Compare commits

...

6 Commits

Author SHA1 Message Date
33bb355975 chore: Release
All checks were successful
Continuous integration / Check (push) Successful in 1m48s
Continuous integration / Test Suite (push) Successful in 2m4s
Continuous integration / Rustfmt (push) Successful in 58s
Continuous integration / Trunk (push) Successful in 2m11s
Continuous integration / build (push) Successful in 3m33s
Continuous integration / Disallow unused dependencies (push) Successful in 5m42s
2026-01-08 16:13:19 -08:00
2f20a3a8ed server: set user-agent when slurping, fixes /. bug 2026-01-08 16:13:00 -08:00
8b3bfe253f Merge pull request 'chore(deps): update actions/checkout action to v6' (#197) from renovate/actions-checkout-6.x into master
All checks were successful
Continuous integration / Check (push) Successful in 3m43s
Continuous integration / Test Suite (push) Successful in 3m52s
Continuous integration / Rustfmt (push) Successful in 46s
Continuous integration / Trunk (push) Successful in 2m27s
Continuous integration / build (push) Successful in 2m20s
Continuous integration / Disallow unused dependencies (push) Successful in 5m39s
Reviewed-on: #197
2026-01-08 12:23:57 -08:00
22b9646ac4 Merge pull request 'fix(deps): update rust crate zip to v7' (#217) from renovate/zip-7.x into master
Some checks failed
Continuous integration / Check (push) Has been cancelled
Continuous integration / Test Suite (push) Has been cancelled
Continuous integration / Trunk (push) Has been cancelled
Continuous integration / Rustfmt (push) Has been cancelled
Continuous integration / build (push) Has been cancelled
Continuous integration / Disallow unused dependencies (push) Has been cancelled
Reviewed-on: #217
2026-01-08 12:23:42 -08:00
bf7418339e fix(deps): update rust crate zip to v7
All checks were successful
Continuous integration / Check (push) Successful in 1m36s
Continuous integration / Test Suite (push) Successful in 2m46s
Continuous integration / Rustfmt (push) Successful in 40s
Continuous integration / build (push) Successful in 2m46s
Continuous integration / Disallow unused dependencies (push) Successful in 2m19s
Continuous integration / Trunk (push) Successful in 21m7s
2025-12-20 00:01:57 +00:00
51ff0b8e14 chore(deps): update actions/checkout action to v6
All checks were successful
Continuous integration / Check (push) Successful in 58s
Continuous integration / Test Suite (push) Successful in 1m51s
Continuous integration / Rustfmt (push) Successful in 41s
Continuous integration / build (push) Successful in 1m53s
Continuous integration / Disallow unused dependencies (push) Successful in 2m19s
Continuous integration / Trunk (push) Successful in 1m41s
2025-11-20 16:46:50 +00:00
5 changed files with 28 additions and 24 deletions

View File

@@ -7,7 +7,7 @@ jobs:
name: Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo check
@@ -15,7 +15,7 @@ jobs:
name: Test Suite
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo test
@@ -23,7 +23,7 @@ jobs:
name: Trunk
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly
@@ -35,7 +35,7 @@ jobs:
name: Rustfmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
components: rustfmt
@@ -46,7 +46,7 @@ jobs:
name: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo build
@@ -54,7 +54,7 @@ jobs:
name: Disallow unused dependencies
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly

31
Cargo.lock generated
View File

@@ -1128,9 +1128,9 @@ dependencies = [
[[package]]
name = "crc"
version = "3.4.0"
version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
dependencies = [
"crc-catalog",
]
@@ -3203,7 +3203,7 @@ dependencies = [
[[package]]
name = "letterbox-notmuch"
version = "0.17.57"
version = "0.17.58"
dependencies = [
"itertools",
"log",
@@ -3218,7 +3218,7 @@ dependencies = [
[[package]]
name = "letterbox-procmail2notmuch"
version = "0.17.57"
version = "0.17.58"
dependencies = [
"anyhow",
"clap",
@@ -3231,7 +3231,7 @@ dependencies = [
[[package]]
name = "letterbox-server"
version = "0.17.57"
version = "0.17.58"
dependencies = [
"ammonia",
"anyhow",
@@ -3254,8 +3254,8 @@ dependencies = [
"html-escape",
"html2text",
"ical",
"letterbox-notmuch 0.17.57",
"letterbox-shared 0.17.57",
"letterbox-notmuch 0.17.58",
"letterbox-shared 0.17.58",
"linkify",
"lol_html",
"mailparse",
@@ -3296,10 +3296,10 @@ dependencies = [
[[package]]
name = "letterbox-shared"
version = "0.17.57"
version = "0.17.58"
dependencies = [
"build-info",
"letterbox-notmuch 0.17.57",
"letterbox-notmuch 0.17.58",
"regex",
"serde",
"sqlx",
@@ -3309,7 +3309,7 @@ dependencies = [
[[package]]
name = "letterbox-web"
version = "0.17.57"
version = "0.17.58"
dependencies = [
"build-info",
"build-info-build",
@@ -3321,7 +3321,7 @@ dependencies = [
"graphql_client",
"human_format",
"itertools",
"letterbox-shared 0.17.57",
"letterbox-shared 0.17.58",
"log",
"seed",
"seed_hooks",
@@ -3509,9 +3509,9 @@ checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a"
[[package]]
name = "lzma-rust2"
version = "0.13.0"
version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c60a23ffb90d527e23192f1246b14746e2f7f071cb84476dd879071696c18a4a"
checksum = "48172246aa7c3ea28e423295dd1ca2589a24617cc4e588bb8cfe177cb2c54d95"
dependencies = [
"crc",
"sha2 0.10.9",
@@ -7978,9 +7978,9 @@ dependencies = [
[[package]]
name = "zip"
version = "6.0.0"
version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb2a05c7c36fde6c09b08576c9f7fb4cda705990f73b58fe011abf7dfb24168b"
checksum = "bdd8a47718a4ee5fe78e07667cd36f3de80e7c2bfe727c7074245ffc7303c037"
dependencies = [
"aes",
"arbitrary",
@@ -7989,6 +7989,7 @@ dependencies = [
"crc32fast",
"deflate64",
"flate2",
"generic-array 0.14.7",
"getrandom 0.3.4",
"hmac 0.12.1",
"indexmap 2.12.1",

View File

@@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
edition = "2021"
license = "UNLICENSED"
publish = ["xinu"]
version = "0.17.57"
version = "0.17.58"
repository = "https://git.z.xinu.tv/wathiede/letterbox"
[profile.dev]

View File

@@ -56,7 +56,7 @@ urlencoding = "2.1.3"
#xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
#xtracing = { path = "../../xtracing" }
xtracing = { version = "0.3.2", registry = "xinu" }
zip = "6.0.0"
zip = "7.0.0"
[build-dependencies]

View File

@@ -44,6 +44,8 @@ use crate::{
const NEWSREADER_TAG_PREFIX: &'static str = "News/";
const NEWSREADER_THREAD_PREFIX: &'static str = "news:";
const USER_AGENT: &'static str = "letterbox news reader (letterbox-ua@xinu.tv)";
// TODO: figure out how to use Cow
#[async_trait]
trait Transformer: Send + Sync {
@@ -318,7 +320,8 @@ impl<'c> Transformer for SlurpContents<'c> {
let body = if let Some(body) = cacher.get(link.as_str()) {
String::from_utf8_lossy(&body).to_string()
} else {
let resp = reqwest::get(link.as_str()).await?;
let client = reqwest::Client::builder().user_agent(USER_AGENT).build()?;
let resp = client.get(link.as_str()).send().await?;
let status = resp.status();
if status.is_server_error() {
error!("status error for {link}: {status}");