Compare commits

..

No commits in common. "c10ad00ca77808294e714c10edb2a2b4291c5c39" and "007200b37b7df6189339615e8f66a64eea82f2c3" have entirely different histories.

5 changed files with 31 additions and 34 deletions

56
Cargo.lock generated
View File

@ -3021,20 +3021,6 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-notmuch" name = "letterbox-notmuch"
version = "0.17.3" version = "0.17.3"
source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
checksum = "660e35d98139603d764aba884faea20b6ebd43864afd8a70ee0864d161cb7089"
dependencies = [
"log",
"mailparse",
"serde",
"serde_json",
"thiserror 2.0.12",
"tracing",
]
[[package]]
name = "letterbox-notmuch"
version = "0.17.4"
dependencies = [ dependencies = [
"itertools", "itertools",
"log", "log",
@ -3047,14 +3033,28 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "letterbox-notmuch"
version = "0.17.3"
source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
checksum = "660e35d98139603d764aba884faea20b6ebd43864afd8a70ee0864d161cb7089"
dependencies = [
"log",
"mailparse",
"serde",
"serde_json",
"thiserror 2.0.12",
"tracing",
]
[[package]] [[package]]
name = "letterbox-procmail2notmuch" name = "letterbox-procmail2notmuch"
version = "0.17.4" version = "0.17.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
"letterbox-notmuch 0.17.3", "letterbox-notmuch 0.17.3 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
"letterbox-shared 0.17.3", "letterbox-shared 0.17.3 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
"serde", "serde",
"sqlx", "sqlx",
"tokio 1.44.2", "tokio 1.44.2",
@ -3062,7 +3062,7 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-server" name = "letterbox-server"
version = "0.17.4" version = "0.17.3"
dependencies = [ dependencies = [
"ammonia", "ammonia",
"anyhow", "anyhow",
@ -3080,8 +3080,8 @@ dependencies = [
"futures 0.3.31", "futures 0.3.31",
"headers", "headers",
"html-escape", "html-escape",
"letterbox-notmuch 0.17.3", "letterbox-notmuch 0.17.3 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
"letterbox-shared 0.17.3", "letterbox-shared 0.17.3 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
"linkify", "linkify",
"log", "log",
"lol_html", "lol_html",
@ -3107,11 +3107,9 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-shared" name = "letterbox-shared"
version = "0.17.3" version = "0.17.3"
source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
checksum = "e30cefa3eebb0b15b077527072a4a53dbde8dd6cb513b20e78f036a84c86329a"
dependencies = [ dependencies = [
"build-info", "build-info",
"letterbox-notmuch 0.17.3", "letterbox-notmuch 0.17.3 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
"regex", "regex",
"serde", "serde",
"sqlx", "sqlx",
@ -3121,10 +3119,12 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-shared" name = "letterbox-shared"
version = "0.17.4" version = "0.17.3"
source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
checksum = "e30cefa3eebb0b15b077527072a4a53dbde8dd6cb513b20e78f036a84c86329a"
dependencies = [ dependencies = [
"build-info", "build-info",
"letterbox-notmuch 0.17.3", "letterbox-notmuch 0.17.3 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
"regex", "regex",
"serde", "serde",
"sqlx", "sqlx",
@ -3134,7 +3134,7 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-web" name = "letterbox-web"
version = "0.17.4" version = "0.17.3"
dependencies = [ dependencies = [
"build-info", "build-info",
"build-info-build", "build-info-build",
@ -3146,8 +3146,8 @@ dependencies = [
"graphql_client", "graphql_client",
"human_format", "human_format",
"itertools", "itertools",
"letterbox-notmuch 0.17.3", "letterbox-notmuch 0.17.3 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
"letterbox-shared 0.17.3", "letterbox-shared 0.17.3 (sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/)",
"log", "log",
"seed", "seed",
"seed_hooks", "seed_hooks",

View File

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

View File

@ -50,7 +50,7 @@ url = "2.5.4"
urlencoding = "2.1.3" urlencoding = "2.1.3"
#xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" } #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
#xtracing = { path = "../../xtracing" } #xtracing = { path = "../../xtracing" }
xtracing = { version = "0.3.2", registry = "xinu" } xtracing = { version = "0.3.1", registry = "xinu" }
[build-dependencies] [build-dependencies]
build-info-build = "0.0.40" build-info-build = "0.0.40"

View File

@ -1005,9 +1005,6 @@ pub async fn label_unprocessed(
for t in &add_tags { for t in &add_tags {
nm.tag_add(t, &id)?; nm.tag_add(t, &id)?;
} }
if add_tags.contains("spam") || add_tags.contains("Spam") {
nm.tag_remove("unread", &id)?;
}
if !add_tags.contains("inbox") { if !add_tags.contains("inbox") {
nm.tag_remove("inbox", &id)?; nm.tag_remove("inbox", &id)?;
} }

View File

@ -671,7 +671,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
} }
Msg::WebsocketMessage(msg) => { Msg::WebsocketMessage(msg) => {
match msg { match msg {
WebsocketMessage::RefreshMessages => orders.send_msg(Msg::RefreshStart), WebsocketMessage::RefreshMessages => orders.send_msg(Msg::Refresh),
}; };
} }
} }