Compare commits

..

No commits in common. "cffc228b3a1dca52d7f62ef6e8dcdf38e1e9e2ec" and "92b880f03b528868e942f2188384969f5293f91d" have entirely different histories.

8 changed files with 29 additions and 35 deletions

10
Cargo.lock generated
View File

@ -2995,7 +2995,7 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-notmuch" name = "letterbox-notmuch"
version = "0.15.3" version = "0.15.2"
dependencies = [ dependencies = [
"itertools", "itertools",
"log", "log",
@ -3010,14 +3010,14 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-procmail2notmuch" name = "letterbox-procmail2notmuch"
version = "0.15.3" version = "0.15.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
] ]
[[package]] [[package]]
name = "letterbox-server" name = "letterbox-server"
version = "0.15.3" version = "0.15.2"
dependencies = [ dependencies = [
"ammonia", "ammonia",
"anyhow", "anyhow",
@ -3061,7 +3061,7 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-shared" name = "letterbox-shared"
version = "0.15.3" version = "0.15.2"
dependencies = [ dependencies = [
"build-info", "build-info",
"letterbox-notmuch", "letterbox-notmuch",
@ -3071,7 +3071,7 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-web" name = "letterbox-web"
version = "0.15.3" version = "0.15.2"
dependencies = [ dependencies = [
"build-info", "build-info",
"build-info-build", "build-info-build",

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.15.3" version = "0.15.2"
repository = "https://git.z.xinu.tv/wathiede/letterbox" repository = "https://git.z.xinu.tv/wathiede/letterbox"
[profile.dev] [profile.dev]

View File

@ -27,8 +27,8 @@ css-inline = "0.14.0"
futures = "0.3.31" futures = "0.3.31"
headers = "0.4.0" headers = "0.4.0"
html-escape = "0.2.13" html-escape = "0.2.13"
letterbox-notmuch = { version = "0.15.3", path = "../notmuch", registry = "xinu" } letterbox-notmuch = { version = "0.15.2", path = "../notmuch", registry = "xinu" }
letterbox-shared = { version = "0.15.3", path = "../shared", registry = "xinu" } letterbox-shared = { version = "0.15.2", path = "../shared", registry = "xinu" }
linkify = "0.10.0" linkify = "0.10.0"
log = "0.4.17" log = "0.4.17"
lol_html = "2.0.0" lol_html = "2.0.0"

View File

@ -165,7 +165,6 @@ async fn start_ws(
struct NotificationParams { struct NotificationParams {
delay_ms: Option<u64>, delay_ms: Option<u64>,
} }
async fn send_refresh_websocket_handler( async fn send_refresh_websocket_handler(
State(AppState { State(AppState {
connection_tracker, .. connection_tracker, ..
@ -250,7 +249,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
let connection_tracker = Arc::new(Mutex::new(ConnectionTracker::default())); let connection_tracker = Arc::new(Mutex::new(ConnectionTracker::default()));
let ct = Arc::clone(&connection_tracker); let ct = Arc::clone(&connection_tracker);
let poll_time = Duration::from_secs(60); let poll_time = Duration::from_secs(10);
let _h = tokio::spawn(watch_new(nm.clone(), pool, ct, poll_time)); let _h = tokio::spawn(watch_new(nm.clone(), pool, ct, poll_time));
let api_routes = Router::new() let api_routes = Router::new()

View File

@ -135,7 +135,6 @@ pub fn tags(nm: &Notmuch, needs_unread: bool) -> Result<Vec<Tag>, ServerError> {
unread, unread,
} }
}) })
/*
.chain( .chain(
nm.unread_recipients()? nm.unread_recipients()?
.into_iter() .into_iter()
@ -153,7 +152,6 @@ pub fn tags(nm: &Notmuch, needs_unread: bool) -> Result<Vec<Tag>, ServerError> {
}) })
}), }),
) )
*/
.collect(); .collect();
Ok(tags) Ok(tags)
} }

View File

@ -12,6 +12,6 @@ version.workspace = true
[dependencies] [dependencies]
build-info = "0.0.40" build-info = "0.0.40"
letterbox-notmuch = { version = "0.15.3", path = "../notmuch", registry = "xinu" } letterbox-notmuch = { version = "0.15.2", path = "../notmuch", registry = "xinu" }
serde = { version = "1.0.147", features = ["derive"] } serde = { version = "1.0.147", features = ["derive"] }
strum_macros = "0.27.1" strum_macros = "0.27.1"

View File

@ -33,8 +33,8 @@ wasm-bindgen = "=0.2.100"
uuid = { version = "1.13.1", features = [ uuid = { version = "1.13.1", features = [
"js", "js",
] } # direct dep to set js feature, prevents Rng issues ] } # direct dep to set js feature, prevents Rng issues
letterbox-shared = { version = "0.15.3", path = "../shared", registry = "xinu" } letterbox-shared = { version = "0.15.2", path = "../shared", registry = "xinu" }
letterbox-notmuch = { version = "0.15.3", path = "../notmuch", registry = "xinu" } letterbox-notmuch = { version = "0.15.2", path = "../notmuch", registry = "xinu" }
seed_hooks = { version = "0.4.0", registry = "xinu" } seed_hooks = { version = "0.4.0", registry = "xinu" }
strum_macros = "0.27.1" strum_macros = "0.27.1"
gloo-console = "0.3.0" gloo-console = "0.3.0"

View File

@ -13,9 +13,6 @@ backend = "ws://localhost:9345/api/ws"
[[proxy]] [[proxy]]
backend = "http://localhost:9345/api/" backend = "http://localhost:9345/api/"
[[proxy]]
backend = "http://localhost:9345/notification/"
[[hooks]] [[hooks]]
stage = "pre_build" stage = "pre_build"
command = "printf" command = "printf"