Compare commits

...

2 Commits

Author SHA1 Message Date
fa6fe673bd chore: Release
Some checks failed
Continuous integration / Check (push) Successful in 1m13s
Continuous integration / Test Suite (push) Successful in 2m2s
Continuous integration / Trunk (push) Successful in 59s
Continuous integration / Rustfmt (push) Failing after 47s
Continuous integration / build (push) Successful in 1m42s
Continuous integration / Disallow unused dependencies (push) Successful in 5m40s
2026-02-01 17:16:48 -08:00
44961f6ef1 web: conditionally show spam button in catchup 2026-02-01 17:16:24 -08:00
3 changed files with 32 additions and 29 deletions

52
Cargo.lock generated
View File

@@ -3166,6 +3166,20 @@ dependencies = [
[[package]]
name = "letterbox-notmuch"
version = "0.17.65"
source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
checksum = "a24b7c129088ca40ce69b0d738a5fed4bc389b92512cb43b9c5e2fc3c88d4cbc"
dependencies = [
"log",
"mailparse",
"serde",
"serde_json",
"thiserror 2.0.18",
"tracing",
]
[[package]]
name = "letterbox-notmuch"
version = "0.17.66"
dependencies = [
"itertools",
"log",
@@ -3178,28 +3192,14 @@ dependencies = [
"tracing",
]
[[package]]
name = "letterbox-notmuch"
version = "0.17.65"
source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
checksum = "a24b7c129088ca40ce69b0d738a5fed4bc389b92512cb43b9c5e2fc3c88d4cbc"
dependencies = [
"log",
"mailparse",
"serde",
"serde_json",
"thiserror 2.0.18",
"tracing",
]
[[package]]
name = "letterbox-procmail2notmuch"
version = "0.17.65"
version = "0.17.66"
dependencies = [
"anyhow",
"clap",
"letterbox-notmuch 0.17.65 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
"letterbox-shared 0.17.65 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
"letterbox-notmuch 0.17.65",
"letterbox-shared 0.17.65",
"serde",
"sqlx",
"tokio 1.49.0",
@@ -3207,7 +3207,7 @@ dependencies = [
[[package]]
name = "letterbox-server"
version = "0.17.65"
version = "0.17.66"
dependencies = [
"ammonia",
"anyhow",
@@ -3230,8 +3230,8 @@ dependencies = [
"html-escape",
"html2text",
"ical",
"letterbox-notmuch 0.17.65",
"letterbox-shared 0.17.65",
"letterbox-notmuch 0.17.66",
"letterbox-shared 0.17.66",
"linkify",
"lol_html",
"mailparse",
@@ -3258,6 +3258,8 @@ dependencies = [
[[package]]
name = "letterbox-shared"
version = "0.17.65"
source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
checksum = "41ad8210629ccaca787173628b19314076261038870e920c370fc2205533d01b"
dependencies = [
"build-info",
"letterbox-notmuch 0.17.65",
@@ -3270,12 +3272,10 @@ dependencies = [
[[package]]
name = "letterbox-shared"
version = "0.17.65"
source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
checksum = "41ad8210629ccaca787173628b19314076261038870e920c370fc2205533d01b"
version = "0.17.66"
dependencies = [
"build-info",
"letterbox-notmuch 0.17.65 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
"letterbox-notmuch 0.17.66",
"regex",
"serde",
"sqlx",
@@ -3285,7 +3285,7 @@ dependencies = [
[[package]]
name = "letterbox-web"
version = "0.17.65"
version = "0.17.66"
dependencies = [
"build-info",
"build-info-build",
@@ -3297,7 +3297,7 @@ dependencies = [
"graphql_client",
"human_format",
"itertools",
"letterbox-shared 0.17.65",
"letterbox-shared 0.17.66",
"log",
"seed",
"seed_hooks",

View File

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

View File

@@ -100,6 +100,7 @@ pub fn view(model: &Model) -> Node<Msg> {
&catchup.items,
is_loading,
model.read_completion_ratio,
true, // show spam button for email
)
} else {
normal_view(
@@ -127,6 +128,7 @@ pub fn view(model: &Model) -> Node<Msg> {
&catchup.items,
is_loading,
model.read_completion_ratio,
false, // no spam button for news
)
} else {
normal_view(
@@ -193,6 +195,7 @@ fn catchup_view(
items: &[CatchupItem],
is_loading: bool,
read_completion_ratio: f64,
show_spam_button: bool,
) -> Node<Msg> {
div![
C!["w-full", "relative", "text-white"],
@@ -268,14 +271,14 @@ fn catchup_view(
Msg::GoToSearchResults
]))
],
button![
IF!(show_spam_button => button![
tw_classes::button(),
C!["text-red-500"],
attrs! {At::Title => "Mark as spam"},
span![i![C!["far", "fa-hand"]]],
span![C!["pl-2"], "Spam"],
ev(Ev::Click, |_| Msg::CatchupMarkAsSpam)
],
]),
button![
tw_classes::button_with_color("bg-green-800", "hover:bg-green-700"),
span![i![C!["far", "fa-envelope-open"]]],