From 3ffdf8f0d7ad91a32185e95d68693ba5e0eb40dd Mon Sep 17 00:00:00 2001 From: Robert Perce Date: Fri, 3 Apr 2026 11:54:36 -0500 Subject: [PATCH 1/6] refactor: switch from chrono to jiff --- Cargo.lock | 57 +++++++++++++++++++ Cargo.toml | 1 + e2e/pages/contact.spec.ts | 23 +++++--- src/models/birthday.rs | 24 +++++--- src/models/contact.rs | 11 ++-- src/models/journal.rs | 6 +- src/models/year_optional_date.rs | 57 +++++++++---------- src/switchboard.rs | 10 +--- src/web/contact/mod.rs | 94 +++++++++++++++----------------- src/web/home.rs | 57 +++++++++---------- src/web/ics.rs | 6 +- src/web/journal.rs | 20 +++---- 12 files changed, 205 insertions(+), 161 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b300c23..3c03174 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1280,6 +1280,47 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +[[package]] +name = "jiff" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359" +dependencies = [ + "jiff-static", + "jiff-tzdb-platform", + "log", + "portable-atomic", + "portable-atomic-util", + "serde_core", + "windows-sys 0.61.2", +] + +[[package]] +name = "jiff-static" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "jiff-tzdb" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c900ef84826f1338a557697dc8fc601df9ca9af4ac137c7fb61d4c6f2dfd3076" + +[[package]] +name = "jiff-tzdb-platform" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" +dependencies = [ + "jiff-tzdb", +] + [[package]] name = "js-sys" version = "0.3.81" @@ -1427,6 +1468,7 @@ dependencies = [ "http", "icalendar", "itertools 0.14.0", + "jiff", "listenfd", "markdown", "maud", @@ -1847,6 +1889,21 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +[[package]] +name = "portable-atomic" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" + +[[package]] +name = "portable-atomic-util" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3" +dependencies = [ + "portable-atomic", +] + [[package]] name = "potential_utf" version = "0.1.3" diff --git a/Cargo.toml b/Cargo.toml index d246956..5b03dc4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,6 +19,7 @@ clap = { version = "4.5.53", features = ["derive"] } http = "1.3.1" icalendar = "0.17.5" itertools = "0.14.0" +jiff = { version = "0.2.23", features = ["serde"] } listenfd = "1.0.2" markdown = "1.0.0" maud = { version = "0.27.0", features = ["axum"] } diff --git a/e2e/pages/contact.spec.ts b/e2e/pages/contact.spec.ts index dad20e5..46af08e 100644 --- a/e2e/pages/contact.spec.ts +++ b/e2e/pages/contact.spec.ts @@ -30,14 +30,14 @@ test.skip("groups wrap nicely", async ({ page }) => { const groupBox = page.getByPlaceholder(/group name/i); await groupBox.fill('this is a long group name'); - await page.getByRole('button', { name: /save/i }).click(); + await page.getByRole('button', { name: /save/i }).click(); await expect(page.locator('#alpine-loaded')).not.toHaveAttribute('x-cloak'); - // TODO: this drives to the right location but i can't figure out how to assert - // that the text is all on one line. Manual inspection looks good at time of writing. + // TODO: this drives to the right location but i can't figure out how to assert + // that the text is all on one line. Manual inspection looks good at time of writing. }); -test('allow marking as hidden', async ({ page }) => { +test('allow marking as inactive', async ({ page }) => { }); @@ -45,15 +45,20 @@ test('allow exempting from stale', async ({ page }) => { }); +test('stale list considers periodicity', async ({ page }) => { + +}); + +test('page title has contact primary name', async ({ page }) => { + await expect(page.title()).toContain("Test Testerson"); +}); + + +/* test('bullet points in free text display well', async ({ page }) => { }); -twst('page title has contact primary name', async ({ page }) => { - await expect(page.title()).toContain("Test Testerson"); -}); - -/* home: contact list scrolls in screen, not off screen home: clicking off contact list closes it home: contact list is sorted ignoring case diff --git a/src/models/birthday.rs b/src/models/birthday.rs index 603191a..f7c0256 100644 --- a/src/models/birthday.rs +++ b/src/models/birthday.rs @@ -1,4 +1,4 @@ -use chrono::Local; +use jiff::{Timestamp, Unit, Zoned, civil, tz::TimeZone}; use sqlx::sqlite::SqliteRow; use sqlx::{FromRow, Row}; use std::fmt::Display; @@ -29,25 +29,31 @@ impl Display for Birthday { } impl Birthday { - pub fn next_occurrence(&self) -> Option { + pub fn next_occurrence(&self) -> Option { match &self { Birthday::Text(_) => None, - Birthday::Date(date) => Some(date.next_month_day_occurrence()?), + Birthday::Date(date) => date.next_month_day_occurrence(), } } - pub fn until_next(&self) -> Option { + pub fn until_next(&self) -> Option { self.next_occurrence() - .map(|when| when.signed_duration_since(Local::now().date_naive())) + .map(|when| when.since(Zoned::now().date()).ok())? } /// None if this is a text birthday or doesn't have a year - pub fn age(&self) -> Option { + pub fn age(&self) -> Option { match &self { Birthday::Text(_) => None, - Birthday::Date(date) => date - .to_date_naive() - .map(|birthdate| Local::now().date_naive().years_since(birthdate))?, + Birthday::Date(date) => { + let now = Timestamp::now().to_zoned(TimeZone::UTC); + date.to_civil_date().map(|birthdate| { + now.since(&birthdate.to_zoned(TimeZone::UTC).unwrap()) + .unwrap() + .total((Unit::Year, &now)) + .unwrap() as i32 + }) + } } } diff --git a/src/models/contact.rs b/src/models/contact.rs index bad0ff4..8ed0be6 100644 --- a/src/models/contact.rs +++ b/src/models/contact.rs @@ -1,4 +1,4 @@ -use chrono::{DateTime, NaiveDate, Utc}; +use jiff::{Timestamp, civil}; use sqlx::sqlite::SqlitePool; use std::str::FromStr; @@ -18,7 +18,7 @@ struct RawContact { pub struct Contact { pub id: DbId, pub birthday: Option, - pub manually_freshened_at: Option>, + pub manually_freshened_at: Option, pub lives_with: String, } @@ -31,8 +31,7 @@ impl Into for RawContact { .and_then(|s| Birthday::from_str(s.as_ref()).ok()), manually_freshened_at: self .manually_freshened_at - .and_then(|str| DateTime::parse_from_str(str.as_ref(), "%+").ok()) - .map(|d| d.to_utc()), + .and_then(|str| str.parse::().ok()), lives_with: self.lives_with, } } @@ -50,7 +49,7 @@ struct RawHydratedContact { #[derive(Clone, Debug)] pub struct HydratedContact { pub contact: Contact, - pub last_mention_date: Option, + pub last_mention_date: Option, pub names: Vec, } @@ -71,7 +70,7 @@ impl Into for RawHydratedContact { .collect::>(), last_mention_date: self .last_mention_date - .and_then(|str| NaiveDate::from_str(str.as_ref()).ok()), + .and_then(|str| str.parse::().ok()), } } } diff --git a/src/models/journal.rs b/src/models/journal.rs index 4a90d86..fdc9940 100644 --- a/src/models/journal.rs +++ b/src/models/journal.rs @@ -1,4 +1,4 @@ -use chrono::NaiveDate; +use jiff::civil::Date; use maud::{Markup, html}; use serde_json::json; use sqlx::sqlite::{SqlitePool, SqliteRow}; @@ -12,7 +12,7 @@ use crate::switchboard::{MentionHost, MentionHostType}; pub struct JournalEntry { pub id: DbId, pub value: String, - pub date: NaiveDate, + pub date: Date, } impl<'a> Into> for &'a JournalEntry { @@ -69,7 +69,7 @@ impl FromRow<'_, SqliteRow> for JournalEntry { let id: DbId = row.try_get("id")?; let value: String = row.try_get("value")?; let date_str: &str = row.try_get("date")?; - let date = NaiveDate::parse_from_str(date_str, "%Y-%m-%d").unwrap(); + let date: Date = date_str.parse().unwrap(); Ok(Self { id, value, date }) } } diff --git a/src/models/year_optional_date.rs b/src/models/year_optional_date.rs index 196360d..fa1fc1f 100644 --- a/src/models/year_optional_date.rs +++ b/src/models/year_optional_date.rs @@ -1,4 +1,4 @@ -use chrono::{Datelike, Local, NaiveDate}; +use jiff::{Timestamp, civil::Date, tz::TimeZone}; use regex::Regex; use sqlx::{Database, Decode, Encode, Sqlite, encode::IsNull}; use std::fmt::Display; @@ -6,38 +6,39 @@ use std::str::FromStr; #[derive(Debug, Clone)] pub struct YearOptionalDate { - pub year: Option, - pub month: u32, - pub day: u32, + pub year: Option, + pub month: i8, + pub day: i8, } impl YearOptionalDate { - pub fn prev_month_day_occurrence(&self) -> Option { - let now = Local::now(); + pub fn prev_month_day_occurrence(&self) -> Option { + let now = Timestamp::now().to_zoned(TimeZone::UTC); let year = now.year(); - let mut date = NaiveDate::from_ymd_opt(year, self.month, self.day); - if let Some(real_date) = date { - if real_date >= now.date_naive() { - date = NaiveDate::from_ymd_opt(year - 1, self.month, self.day); + Date::new(year, self.month, self.day).ok().and_then(|date| { + if date >= now.date() { + Date::new(year - 1, self.month, self.day).ok() + } else { + Some(date) } - } - date - } - pub fn next_month_day_occurrence(&self) -> Option { - let now = Local::now(); - let year = now.year(); - let mut date = NaiveDate::from_ymd_opt(year, self.month, self.day); - if let Some(real_date) = date { - if real_date < now.date_naive() { - date = NaiveDate::from_ymd_opt(year + 1, self.month, self.day); - } - } - date + }) } - pub fn to_date_naive(&self) -> Option { + pub fn next_month_day_occurrence(&self) -> Option { + let now = Timestamp::now().to_zoned(TimeZone::UTC); + let year = now.year(); + Date::new(year, self.month, self.day).ok().and_then(|date| { + if date < now.date() { + Date::new(year + 1, self.month, self.day).ok() + } else { + Some(date) + } + }) + } + + pub fn to_civil_date(&self) -> Option { if let Some(year) = self.year { - NaiveDate::from_ymd_opt(year, self.month, self.day) + Date::new(year, self.month, self.day).ok() } else { None } @@ -68,12 +69,12 @@ impl FromStr for YearOptionalDate { let date_re = Regex::new(r"^([0-9]{4}|--)([0-9]{2})([0-9]{2})$").unwrap(); if let Some(caps) = date_re.captures(str) { let year_str = &caps[1]; - let month = u32::from_str(&caps[2]).unwrap(); - let day = u32::from_str(&caps[3]).unwrap(); + let month = i8::from_str(&caps[2]).unwrap(); + let day = i8::from_str(&caps[3]).unwrap(); let year = if year_str == "--" { None } else { - Some(i32::from_str(year_str).unwrap()) + Some(i16::from_str(year_str).unwrap()) }; return Ok(Self { year, month, day }); diff --git a/src/switchboard.rs b/src/switchboard.rs index 0b7d3f8..6635700 100644 --- a/src/switchboard.rs +++ b/src/switchboard.rs @@ -74,7 +74,7 @@ impl MentionHost<'_> { } impl Switchboard { - pub async fn gen_trie(pool: &SqlitePool) -> Result, AppError> { + pub async fn gen_trie(pool: &SqlitePool) -> Result, AppError> { let mut trie = radix_trie::Trie::new(); let mentionables = sqlx::query_as!( @@ -109,14 +109,6 @@ impl Switchboard { } } - pub fn remove(self: &mut Self, text: &String) { - self.trie.remove(text); - } - - pub fn add_mentionable(self: &mut Self, text: String, uri: String) { - self.trie.insert(text, uri); - } - pub fn extract_mentions<'a>(&self, host: impl Into>) -> HashSet { let host: MentionHost = host.into(); let name_re = Regex::new(r"\[\[(.+?)\]\]").unwrap(); diff --git a/src/web/contact/mod.rs b/src/web/contact/mod.rs index 35f66e0..6386bdd 100644 --- a/src/web/contact/mod.rs +++ b/src/web/contact/mod.rs @@ -7,19 +7,19 @@ use axum::{ }; use axum_extra::extract::Form; use cache_bust::asset; -use chrono::DateTime; +use jiff::{Timestamp, Unit, tz::TimeZone}; use maud::{Markup, html}; use serde::Deserialize; use serde_json::json; use slug::slugify; -use sqlx::{QueryBuilder, Sqlite}; +use sqlx::QueryBuilder; use super::Layout; use super::home::journal_section; use crate::db::DbId; use crate::models::user::AuthSession; use crate::models::{HydratedContact, JournalEntry}; -use crate::switchboard::{MentionHost, MentionHostType, insert_mentions, Switchboard}; +use crate::switchboard::{MentionHost, MentionHostType, Switchboard, insert_mentions}; use crate::{AppError, AppState}; pub mod fields; @@ -40,22 +40,22 @@ pub fn router() -> Router { .route("/contact/{contact_id}/edit", get(self::get::contact_edit)) } -fn human_delta(delta: &chrono::TimeDelta) -> String { - if delta.num_days() == 0 { - return "today".to_string(); - } +fn human_delta(span: &jiff::Span) -> String { + let todate = Timestamp::now().to_zoned(TimeZone::UTC).date(); + let span = span + .round( + jiff::SpanRound::new() + .largest(Unit::Year) + .smallest(Unit::Day) + .relative(todate), + ) + .unwrap(); - let mut result = "in ".to_string(); - let mut rem = delta.clone(); - if rem.num_days().abs() >= 7 { - let weeks = rem.num_days() / 7; - rem -= chrono::TimeDelta::days(weeks * 7); - result.push_str(&format!("{}w ", weeks)); + if span.is_zero() { + "today".to_string() + } else { + format!("in {:#}", span) } - if rem.num_days().abs() > 0 { - result.push_str(&format!("{}d ", rem.num_days())); - } - result.trim().to_string() } mod get { @@ -88,7 +88,9 @@ mod get { .await?; let freshened = std::cmp::max( - contact.manually_freshened_at.map(|when| when.date_naive()), + contact + .manually_freshened_at + .map(|when| when.to_zoned(jiff::tz::TimeZone::UTC).date()), entries.get(0).map(|entry| entry.date), ); @@ -213,7 +215,7 @@ mod get { let mfresh_str = contact .manually_freshened_at .clone() - .map_or("".to_string(), |m| m.to_rfc3339()); + .map_or("".to_string(), |m| m.to_string()); let text_body: String = sqlx::query!("select text_body from contacts where id = $1", contact_id) @@ -224,7 +226,7 @@ mod get { Ok(layout.render( format!("Edit: {}", contact.names.get(0).unwrap_or(&String::from("(unknown)"))), - Some(vec![asset!("contact.css")]), + Some(vec![asset!("contact.css")]), html! { form hx-ext="response-targets" { div { @@ -351,14 +353,15 @@ mod put { Some(payload.birthday) }; - let manually_freshened_at = if payload.manually_freshened_at.is_empty() { + let manually_freshened_at: Option = if payload.manually_freshened_at.is_empty() { None } else { Some( - DateTime::parse_from_str(&payload.manually_freshened_at, "%+") + payload + .manually_freshened_at + .parse::() .map_err(|_| anyhow::Error::msg("Could not parse freshened-at string"))? - .to_utc() - .to_rfc3339(), + .to_string(), ) }; @@ -386,9 +389,6 @@ mod put { .execute(pool) .await?; - if old_contact.text_body != text_body { - } - // these blocks are not in functions because payload gets progressively // partially moved as we handle each field and i don't want to deal with it @@ -488,25 +488,21 @@ mod put { let old_names: Vec = old_names.into_iter().map(|(s,)| s).collect(); if old_names != new_names { - sqlx::query!( - "delete from names where contact_id = $1", - contact_id - ) - .execute(pool) - .await?; - - if !new_names.is_empty() { - QueryBuilder::new( - "insert into names (contact_id, sort, name) " - ).push_values(new_names.iter().enumerate(), |mut b, (sort, name)| { - b - .push_bind(contact_id) - .push_bind(DbId::try_from(sort).unwrap()) - .push_bind(name); - }).build() - .persistent(false) + sqlx::query!("delete from names where contact_id = $1", contact_id) .execute(pool) .await?; + + if !new_names.is_empty() { + QueryBuilder::new("insert into names (contact_id, sort, name) ") + .push_values(new_names.iter().enumerate(), |mut b, (sort, name)| { + b.push_bind(contact_id) + .push_bind(DbId::try_from(sort).unwrap()) + .push_bind(name); + }) + .build() + .persistent(false) + .execute(pool) + .await?; } } @@ -524,12 +520,9 @@ mod put { let old_groups: Vec = old_groups.into_iter().map(|(s,)| s).collect(); if new_groups != old_groups { - sqlx::query!( - "delete from groups where contact_id = $1", - contact_id - ) - .execute(pool) - .await?; + sqlx::query!("delete from groups where contact_id = $1", contact_id) + .execute(pool) + .await?; if new_groups.len() > 0 { QueryBuilder::new("insert into groups (contact_id, name, slug) ") @@ -566,7 +559,6 @@ mod put { .await?; } - if regen_text_body { sqlx::query!( "delete from mentions where entity_id = $1 and entity_type = $2", diff --git a/src/web/home.rs b/src/web/home.rs index 36c2a31..8af2d07 100644 --- a/src/web/home.rs +++ b/src/web/home.rs @@ -1,7 +1,7 @@ use axum::extract::State; use axum::response::IntoResponse; use cache_bust::asset; -use chrono::{Local, NaiveDate, TimeDelta}; +use jiff::{Timestamp, Unit, Zoned, civil, tz::TimeZone}; use maud::{Markup, html}; use sqlx::sqlite::SqlitePool; @@ -15,7 +15,7 @@ use crate::{AppError, AppState}; struct ContactFreshness { contact_id: DbId, display: String, - fresh_date: NaiveDate, + fresh_date: civil::Date, fresh_str: String, elapsed_str: String, } @@ -46,8 +46,8 @@ fn freshness_section(freshens: &Vec) -> Result, @@ -64,7 +64,7 @@ fn birthdays_section( (contact.display) } span { - (contact.next_birthday.format("%m-%d")) + (contact.next_birthday.strftime("%m-%d")) } } } @@ -75,7 +75,7 @@ fn birthdays_section( (contact.display) } span { - (contact.prev_birthday.format("%m-%d")) + (contact.prev_birthday.strftime("%m-%d")) } } } @@ -103,7 +103,7 @@ pub async fn journal_section( added to the top of the list regardless of date; refresh the page to re-sort." } form hx-post="/journal_entry" hx-target="next .entries" hx-target-error="#journal-error" hx-swap="afterbegin" hx-on::after-request="if(event.detail.successful) this.reset()" { - input name="date" placeholder=(Local::now().date_naive().to_string()); + input name="date" placeholder=(Zoned::now().date().to_string()); textarea name="value" placeholder="New entry..." autofocus {} input type="submit" value="Add Entry"; } @@ -135,11 +135,11 @@ pub mod get { .clone() .into_iter() .map(|contact| { - let zero = NaiveDate::from_epoch_days(0).unwrap(); + let zero = jiff::civil::Date::ZERO; let fresh_date = std::cmp::max( contact .manually_freshened_at - .map(|x| x.date_naive()) + .map(|ts| ts.to_zoned(TimeZone::UTC).date()) .unwrap_or(zero), contact.last_mention_date.unwrap_or(zero), ); @@ -152,30 +152,23 @@ pub mod get { elapsed_str: "".to_string(), } } else { - let mut duration = Local::now().date_naive().signed_duration_since(fresh_date); - let mut elapsed: Vec = Vec::new(); - let y = duration.num_weeks() / 52; - let count = |n: i64, noun: &str| { - format!("{} {}{}", n, noun, if n > 1 { "s" } else { "" }) - }; - if y > 0 { - elapsed.push(count(y, "year")); - duration -= TimeDelta::weeks(y * 52); - } - let w = duration.num_weeks(); - if w > 0 { - elapsed.push(count(w, "week")); - duration -= TimeDelta::weeks(w); - } - let d = duration.num_days(); - if d > 0 { - elapsed.push(count(d, "day")); - } + let utc = TimeZone::UTC; + let todate = Timestamp::now().to_zoned(utc.clone()).date(); + let duration = todate + .since(&fresh_date.to_zoned(utc).unwrap()) + .unwrap() + .round( + jiff::SpanRound::new() + .largest(Unit::Year) + .smallest(Unit::Day) + .relative(todate), + ) + .unwrap(); - let elapsed_str = if elapsed.is_empty() { + let elapsed_str = if duration.is_zero() { "today".to_string() } else { - elapsed.join(", ") + format!("{:#}", duration) }; ContactFreshness { @@ -197,8 +190,8 @@ pub mod get { Some(KnownBirthdayContact { contact_id: contact.id, display: contact.display_name(), - prev_birthday: date.prev_month_day_occurrence().unwrap(), - next_birthday: date.next_month_day_occurrence().unwrap(), + prev_birthday: date.prev_month_day_occurrence()?, + next_birthday: date.next_month_day_occurrence()?, }) } else { None diff --git a/src/web/ics.rs b/src/web/ics.rs index b7780ec..162b3f9 100644 --- a/src/web/ics.rs +++ b/src/web/ics.rs @@ -61,9 +61,9 @@ mod get { for contact in &contacts { if let Some(Birthday::Date(yo_date)) = &contact.birthday { if let Some(date) = NaiveDate::from_ymd_opt( - yo_date.year.unwrap_or(1900), - yo_date.month, - yo_date.day, + yo_date.year.unwrap_or(1900).into(), + yo_date.month.try_into().unwrap(), + yo_date.day.try_into().unwrap(), ) { calendar.push( Event::new() diff --git a/src/web/journal.rs b/src/web/journal.rs index b3bb30e..2ff6ddc 100644 --- a/src/web/journal.rs +++ b/src/web/journal.rs @@ -4,14 +4,14 @@ use axum::{ response::IntoResponse, routing::{delete, patch, post}, }; -use chrono::{Datelike, Local, NaiveDate}; +use jiff::{Zoned, civil::Date}; use maud::Markup; use regex::Regex; use serde::Deserialize; use crate::models::JournalEntry; use crate::models::user::AuthSession; -use crate::switchboard::{MentionHost, MentionHostType, insert_mentions}; +use crate::switchboard::{MentionHostType, insert_mentions}; use crate::{AppError, AppState, DbId}; pub fn router() -> Router { @@ -39,10 +39,10 @@ mod post { let pool = &state.db(&user).pool; let sw_lock = state.switchboard(&user); - let now = Local::now().date_naive(); + let now = Zoned::now(); let date = if payload.date.is_empty() { - now + now.date() } else { let date_re = Regex::new(r"^(?:(?[0-9]{4})-)?(?:(?[0-9]{2})-)?(?[0-9]{2})$") @@ -54,17 +54,16 @@ mod post { // unwrapping these parses is safe since it's matching [0-9]{2,4} let year = caps .name("year") - .map(|m| m.as_str().parse::().unwrap()) + .map(|m| m.as_str().parse::().unwrap()) .unwrap_or(now.year()); let month = caps .name("month") - .map(|m| m.as_str().parse::().unwrap()) + .map(|m| m.as_str().parse::().unwrap()) .unwrap_or(now.month()); - let day = caps.name("day").unwrap().as_str().parse::().unwrap(); + let day = caps.name("day").unwrap().as_str().parse::().unwrap(); - NaiveDate::from_ymd_opt(year, month, day).ok_or(anyhow::Error::msg( - "invalid date: failed NaiveDate construction", - ))? + Date::new(year, month, day) + .map_err(|_| anyhow::Error::msg("invalid date: failed NaiveDate construction"))? }; // not a macro query, we want to use JournalEntry's custom FromRow @@ -131,7 +130,6 @@ mod patch { insert_mentions(&mentions, pool).await?; } - Ok(new_entry.to_html(pool).await?) } } From b361c1ab5815bf612fa7fdd3e301145ef26959ca Mon Sep 17 00:00:00 2001 From: Robert Perce Date: Fri, 3 Apr 2026 13:47:23 -0500 Subject: [PATCH 2/6] feat: can_stale and periodicity --- .../each_user/0013_contact-periodicity.sql | 8 +++ src/models/contact.rs | 50 +++++++++++++++++-- src/web/contact/mod.rs | 41 +++++++++++++-- src/web/home.rs | 26 +++++++--- 4 files changed, 108 insertions(+), 17 deletions(-) create mode 100644 migrations/each_user/0013_contact-periodicity.sql diff --git a/migrations/each_user/0013_contact-periodicity.sql b/migrations/each_user/0013_contact-periodicity.sql new file mode 100644 index 0000000..05e65ad --- /dev/null +++ b/migrations/each_user/0013_contact-periodicity.sql @@ -0,0 +1,8 @@ +alter table contacts add column + can_stale boolean not null default true; + +alter table contacts add column + periodicity text not null default 'P0D'; + +alter table contacts add column + active boolean not null default true; diff --git a/src/models/contact.rs b/src/models/contact.rs index 8ed0be6..165c43b 100644 --- a/src/models/contact.rs +++ b/src/models/contact.rs @@ -1,4 +1,4 @@ -use jiff::{Timestamp, civil}; +use jiff::{Span, Timestamp, civil::Date}; use sqlx::sqlite::SqlitePool; use std::str::FromStr; @@ -12,6 +12,9 @@ struct RawContact { birthday: Option, manually_freshened_at: Option, lives_with: String, + can_stale: bool, + active: bool, + periodicity: String, } #[derive(Clone, Debug)] @@ -20,6 +23,9 @@ pub struct Contact { pub birthday: Option, pub manually_freshened_at: Option, pub lives_with: String, + pub can_stale: bool, + pub active: bool, + pub periodicity: Span, } impl Into for RawContact { @@ -33,6 +39,9 @@ impl Into for RawContact { .manually_freshened_at .and_then(|str| str.parse::().ok()), lives_with: self.lives_with, + can_stale: self.can_stale, + active: self.active, + periodicity: self.periodicity.parse().unwrap(), } } } @@ -42,6 +51,10 @@ struct RawHydratedContact { birthday: Option, manually_freshened_at: Option, lives_with: String, + can_stale: bool, + active: bool, + periodicity: String, + last_mention_date: Option, names: Option, } @@ -49,7 +62,7 @@ struct RawHydratedContact { #[derive(Clone, Debug)] pub struct HydratedContact { pub contact: Contact, - pub last_mention_date: Option, + pub last_mention_date: Option, pub names: Vec, } @@ -61,6 +74,9 @@ impl Into for RawHydratedContact { birthday: self.birthday, manually_freshened_at: self.manually_freshened_at, lives_with: self.lives_with, + can_stale: self.can_stale, + active: self.active, + periodicity: self.periodicity, }), names: self .names @@ -70,7 +86,7 @@ impl Into for RawHydratedContact { .collect::>(), last_mention_date: self .last_mention_date - .and_then(|str| str.parse::().ok()), + .and_then(|str| str.parse::().ok()), } } } @@ -91,11 +107,27 @@ impl HydratedContact { } } + pub fn status(&self) -> &'static str { + if self.can_stale { + if self.active { "normal" } else { "inactive" } + } else { + "permanent" + } + } + pub async fn load(id: DbId, pool: &SqlitePool) -> Result { // copy-paste the query from 'all', then add "where c.id = $2" to the last line let raw = sqlx::query_as!( RawHydratedContact, - r#"select id, birthday, lives_with, manually_freshened_at as "manually_freshened_at: String", ( + r#"select + id, + birthday, + lives_with, + manually_freshened_at as "manually_freshened_at: String", + can_stale, + active, + periodicity, + ( select string_agg(name,x'1c' order by sort) from names where contact_id = c.id ) as names, ( @@ -122,7 +154,15 @@ impl HydratedContact { pub async fn all(pool: &SqlitePool) -> Result, AppError> { let contacts = sqlx::query_as!( RawHydratedContact, - r#"select id, birthday, lives_with, manually_freshened_at as "manually_freshened_at: String", ( + r#"select + id, + birthday, + lives_with, + manually_freshened_at as "manually_freshened_at: String", + can_stale, + active, + periodicity, + ( select string_agg(name,x'1c' order by sort) from names where contact_id = c.id ) as names, ( diff --git a/src/web/contact/mod.rs b/src/web/contact/mod.rs index 6386bdd..88bd303 100644 --- a/src/web/contact/mod.rs +++ b/src/web/contact/mod.rs @@ -132,6 +132,14 @@ mod get { div { (name) } } } + @if contact.status() != "normal" { + label { "status" } + div { (contact.status()) } + } + @if contact.status() == "normal" && contact.periodicity.is_positive() { + label { "periodicity" } + div { (format!("{:#}", contact.periodicity)) } + } @if let Some(bday) = &contact.birthday { label { "birthday" } div { @@ -235,7 +243,7 @@ mod get { div #error; } - div #fields { + #fields x-data=(json!({ "status": contact.status() })){ label { @if contact.names.len() > 1 { "names" } @else { "name" }} div #names x-data=(format!("{{ names: {:?}, new_name: '' }}", &contact.names)) { template x-for="(name, idx) in names" { @@ -251,6 +259,19 @@ mod get { input type="button" value="Add" x-on:click="names.push(new_name); new_name = ''"; } } + label { "status" } + div { + select name="status" x-model=("status") { + option value="normal" { "Normal" } + option value="permanent" { "Cannot go stale" } + option value="inactive" { "Inactive" } + } + } + label x-show="status === 'normal'" { "minimum stale time" } + div x-show="status === 'normal'"{ + input name="periodicity" value=(format!("{:#}", contact.periodicity)); + span .hint { code { "[0-9]+ (yr|mo|wk|day|h|m|s)" } "(" a href="https://docs.rs/jiff/latest/jiff/struct.Span.html#parsing-and-printing" { "details" } ")" } + } label { "birthday" } div { input name="birthday" value=(contact.birthday.clone().map_or("".to_string(), |b| b.serialize())); @@ -326,6 +347,8 @@ mod put { #[derive(Deserialize)] pub struct PutContact { name: Option>, + status: String, + periodicity: Option, birthday: String, manually_freshened_at: String, lives_with: String, @@ -365,6 +388,10 @@ mod put { ) }; + let active: bool = payload.status != "inactive"; + let can_stale: bool = payload.status != "permanent"; + let periodicity: String = payload.periodicity.unwrap_or("P0D".to_string()); + let text_body = if payload.text_body.is_empty() { None } else { @@ -377,13 +404,19 @@ mod put { sqlx::query!( "update contacts set - (birthday, manually_freshened_at, lives_with, text_body) = - ($1, $2, $3, $4) - where id = $5", + ( + birthday, manually_freshened_at, lives_with, text_body, + active, can_stale, periodicity + ) = + (?, ?, ?, ?, ?, ?, ?) + where id = ?", birthday, manually_freshened_at, payload.lives_with, text_body, + active, + can_stale, + periodicity, contact_id ) .execute(pool) diff --git a/src/web/home.rs b/src/web/home.rs index 8af2d07..231ee6a 100644 --- a/src/web/home.rs +++ b/src/web/home.rs @@ -134,7 +134,11 @@ pub mod get { let mut freshens: Vec = contacts .clone() .into_iter() - .map(|contact| { + .filter_map(|contact| { + if !contact.can_stale || !contact.active { + return None; + } + let zero = jiff::civil::Date::ZERO; let fresh_date = std::cmp::max( contact @@ -144,17 +148,17 @@ pub mod get { contact.last_mention_date.unwrap_or(zero), ); if fresh_date == zero { - ContactFreshness { + Some(ContactFreshness { contact_id: contact.id, display: contact.display_name(), fresh_date, fresh_str: "never".to_string(), elapsed_str: "".to_string(), - } + }) } else { let utc = TimeZone::UTC; let todate = Timestamp::now().to_zoned(utc.clone()).date(); - let duration = todate + let elapsed = todate .since(&fresh_date.to_zoned(utc).unwrap()) .unwrap() .round( @@ -165,19 +169,25 @@ pub mod get { ) .unwrap(); - let elapsed_str = if duration.is_zero() { + if let Some(cmp) = elapsed.compare((contact.periodicity, todate)).ok() { + if cmp == std::cmp::Ordering::Less { + return None; + } + } + + let elapsed_str = if elapsed.is_zero() { "today".to_string() } else { - format!("{:#}", duration) + format!("{:#}", elapsed) }; - ContactFreshness { + Some(ContactFreshness { contact_id: contact.id, display: contact.display_name(), fresh_date, fresh_str: fresh_date.to_string(), elapsed_str, - } + }) } }) .collect(); From f75260c079388ac3b711c63642b4e11227c3bbc6 Mon Sep 17 00:00:00 2001 From: Robert Perce Date: Fri, 3 Apr 2026 13:56:06 -0500 Subject: [PATCH 3/6] chore: gitkeep dbs folder --- .gitignore | 2 +- dbs/.gitkeep | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 dbs/.gitkeep diff --git a/.gitignore b/.gitignore index 774c5d2..3869d49 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ e2e/node_modules e2e/playwright-report e2e/test-results /some_user.db -/dbs +/dbs/* /hashed_static /users.db /.sqlx diff --git a/dbs/.gitkeep b/dbs/.gitkeep new file mode 100644 index 0000000..e69de29 From b079001cc52cb8330206dc474da168e4d36623ec Mon Sep 17 00:00:00 2001 From: Robert Perce Date: Fri, 3 Apr 2026 16:03:16 -0500 Subject: [PATCH 4/6] feat: inactive contacts hidden in sidebar --- e2e/pages/contact.spec.ts | 12 +++++- e2e/pages/journal.spec.ts | 1 - e2e/playwright.config.ts | 90 +++++++++++++++++++-------------------- migrations/demo.sql | 4 +- src/web/contact/mod.rs | 22 +++++++--- src/web/mod.rs | 40 ++++++++++++++++- static/index.css | 12 +++++- 7 files changed, 123 insertions(+), 58 deletions(-) diff --git a/e2e/pages/contact.spec.ts b/e2e/pages/contact.spec.ts index 46af08e..a1e411d 100644 --- a/e2e/pages/contact.spec.ts +++ b/e2e/pages/contact.spec.ts @@ -9,7 +9,7 @@ test.beforeEach(async ({ page }) => { test('manual-freshen date is editable', async ({ page }) => { await page.getByRole('link', { name: /edit/i }).click(); - await expect(page.getByRole('textbox', { name: /freshened/i })).toBeVisible(); + await expect(page.locator('input[name="manually_freshened_on"]')).toBeVisible(); }); test('last-contact date on display resolves journal mentions and manual-freshen', async ({ page }) => { @@ -38,7 +38,15 @@ test.skip("groups wrap nicely", async ({ page }) => { }); test('allow marking as inactive', async ({ page }) => { + await page.getByRole('link', { name: /edit/i }).click(); + await expect(page.locator('#alpine-loaded')).not.toHaveAttribute('x-cloak'); + // TODO: this only works if there's no other comboboxes on the page :/ + await page.getByRole('combobox').selectOption('Inactive') + await page.getByRole('button', { name: /save/i }).click(); + await expect(page.locator('#alpine-loaded')).not.toHaveAttribute('x-cloak'); + + await expect(page.locator('#contacts-sidebar').getByText("Test Testerson")).not.toBeVisible(); }); test('allow exempting from stale', async ({ page }) => { @@ -50,7 +58,7 @@ test('stale list considers periodicity', async ({ page }) => { }); test('page title has contact primary name', async ({ page }) => { - await expect(page.title()).toContain("Test Testerson"); + expect(await page.title()).toContain("Test Testerson"); }); diff --git a/e2e/pages/journal.spec.ts b/e2e/pages/journal.spec.ts index f30efa3..fe9ecb9 100644 --- a/e2e/pages/journal.spec.ts +++ b/e2e/pages/journal.spec.ts @@ -43,7 +43,6 @@ test("changing a contact's names updates journal entries", async ({ page }) => { await page.getByRole('button', { name: 'Add' }).nth(1).click(); await page.getByRole('button', { name: /save/i }).click(); await page.getByRole('link', { name: 'Mascarpone' }).click(); - console.log(await journal.innerHTML()); await expect.soft(journal.getByRole('link', { name: 'JC' })).toHaveCount(1); // delete an existing name diff --git a/e2e/playwright.config.ts b/e2e/playwright.config.ts index 1065269..f1b1fab 100644 --- a/e2e/playwright.config.ts +++ b/e2e/playwright.config.ts @@ -1,72 +1,72 @@ import { defineConfig, devices } from '@playwright/test'; -import 'custom-expects'; +import './custom-expects'; // purposefully not using ??: we want to replace empty empty string with default const BASE_URL = process.env.BASE_URL || 'http://localhost:3000'; let addlConfig = { - retries: process.env.CI ? 2 : 0, + retries: process.env.CI ? 2 : 0, }; let projects = [ - { - name: 'chromium', - use: { ...devices['Desktop Chrome'] }, - }, + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, - { - name: 'firefox', - use: { ...devices['Desktop Firefox'] }, - }, + { + name: 'firefox', + use: { ...devices['Desktop Firefox'] }, + }, - { - name: 'webkit', - use: { ...devices['Desktop Safari'] }, - }, + { + name: 'webkit', + use: { ...devices['Desktop Safari'] }, + }, - /* Test against mobile viewports. */ - { - name: 'Mobile Chrome', - use: { ...devices['Pixel 5'] }, - }, + /* Test against mobile viewports. */ + { + name: 'Mobile Chrome', + use: { ...devices['Pixel 5'] }, + }, - { - name: 'Mobile Safari', - use: { ...devices['iPhone 12'] }, - }, + { + name: 'Mobile Safari', + use: { ...devices['iPhone 12'] }, + }, ]; const pfil = process.env.PROJECT_FILTER; if (pfil) { - if (pfil.startsWith('!')) { - projects = projects.filter(p => p.name !== pfil.slice(1)); - } else { - projects = projects.filter(p => p.name === pfil); - } + if (pfil.startsWith('!')) { + projects = projects.filter(p => p.name !== pfil.slice(1)); + } else { + projects = projects.filter(p => p.name === pfil); + } } /** * See https://playwright.dev/docs/test-configuration. */ export default defineConfig({ - testDir: './pages', - fullyParallel: true, - workers: 1, - /* Fail the build on CI if you accidentally left test.only in the source code. */ - forbidOnly: Boolean(process.env.CI), - /* Reporter to use. See https://playwright.dev/docs/test-reporters */ - reporter: 'html', - /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ - use: { - /* Base URL to use in actions like `await page.goto('/')`. */ - baseURL: BASE_URL, + testDir: './pages', + fullyParallel: true, + workers: 1, + /* Fail the build on CI if you accidentally left test.only in the source code. */ + forbidOnly: Boolean(process.env.CI), + /* Reporter to use. See https://playwright.dev/docs/test-reporters */ + reporter: 'html', + /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ + use: { + /* Base URL to use in actions like `await page.goto('/')`. */ + baseURL: BASE_URL, - /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */ - trace: 'on-first-retry', - }, + /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */ + trace: 'on-first-retry', + }, - /* Configure projects for major browsers */ - projects, - ...addlConfig, + /* Configure projects for major browsers */ + projects, + ...addlConfig, }); diff --git a/migrations/demo.sql b/migrations/demo.sql index 17bda4c..8eb0d76 100644 --- a/migrations/demo.sql +++ b/migrations/demo.sql @@ -7,8 +7,8 @@ insert into names(contact_id, sort, name) values insert into groups(contact_id, name, slug) values (0, 'ABC', 'abc'); -insert into contacts(id, birthday) values - (1, 'April?'); +insert into contacts(id, birthday, active) values + (1, 'April?', false); insert into names(contact_id, sort, name) values (1, 0, 'Bazel Bagend'), (1, 1, 'Bazel'); diff --git a/src/web/contact/mod.rs b/src/web/contact/mod.rs index 88bd303..9f4bf8f 100644 --- a/src/web/contact/mod.rs +++ b/src/web/contact/mod.rs @@ -223,7 +223,9 @@ mod get { let mfresh_str = contact .manually_freshened_at .clone() - .map_or("".to_string(), |m| m.to_string()); + .map_or("".to_string(), |m| { + m.to_zoned(TimeZone::UTC).date().to_string() + }); let text_body: String = sqlx::query!("select text_body from contacts where id = $1", contact_id) @@ -278,10 +280,20 @@ mod get { span .hint { code { "(yyyy|--)mmdd" } " or free text" } } label { "freshened" } - div x-data=(json!({ "date": mfresh_str })) { - input type="hidden" name="manually_freshened_at" x-model="date"; - span x-text="date.length ? date.split('T')[0] : '(never)'" {} - input type="button" value="Mark fresh now" x-on:click="date = new Date().toISOString()"; + div x-data=(json!({ "date": mfresh_str, "stamp": "" })) x-init="today = () => (new Date().toISOString().split('T')[0])" { + input + type="hidden" + name="manually_freshened_at" + x-model="stamp"; + input + type="date" + name="manually_freshened_on" + x-model="date" + x-bind:max="today()" + x-on:input="stamp = new Date(date).toISOString()"; + + input type="button" value="Mark fresh now" x-on:click="date = today(); stamp = new Date().toISOString()"; + span .hint x-text="`max ${today()}`"; } label { "phone" } #phone_numbers x-data=(json!({ "phones": phone_numbers, "new_label": "", "new_number": "" })) { diff --git a/src/web/mod.rs b/src/web/mod.rs index 6a6e141..a7f755d 100644 --- a/src/web/mod.rs +++ b/src/web/mod.rs @@ -25,6 +25,7 @@ struct ContactLink { #[derive(Debug)] pub struct Layout { contact_links: Vec, + inactive_contact_links: Vec, user: User, } @@ -48,6 +49,20 @@ impl FromRequestParts for Layout { from contacts c left join names n on c.id = n.contact_id where n.sort is null or n.sort = 0 + and c.active = true + order by name asc", + ) + .fetch_all(&state.db(&user).pool) + .await?; + + let inactive_contact_links = sqlx::query_as!( + ContactLink, + "select c.id as contact_id, + coalesce(n.name, '(unnamed)') as name + from contacts c + left join names n on c.id = n.contact_id + where n.sort is null or n.sort = 0 + and c.active = false order by name asc", ) .fetch_all(&state.db(&user).pool) @@ -55,13 +70,19 @@ impl FromRequestParts for Layout { Ok(Layout { contact_links, + inactive_contact_links, user, }) } } impl Layout { - pub fn render(&self, title: impl AsRef, css: Option>, content: Markup) -> Markup { + pub fn render( + &self, + title: impl AsRef, + css: Option>, + content: Markup, + ) -> Markup { html! { (DOCTYPE) html { @@ -101,6 +122,23 @@ impl Layout { } } } + + @if !self.inactive_contact_links.is_empty() { + li .inactive { + details { + summary { "Inactive contacts" } + ul { + @for link in &self.inactive_contact_links { + li { + a href=(format!("/contact/{}", link.contact_id)) { + (link.name) + } + } + } + } + } + } + } } } main { diff --git a/static/index.css b/static/index.css index 03bf9da..5889146 100644 --- a/static/index.css +++ b/static/index.css @@ -8,7 +8,7 @@ html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abb body { width: 100%; - min-height: 100vh; + height: 100vh; display: flex; flex-direction: column; align-items: center; @@ -35,6 +35,7 @@ section#content { display: flex; flex-direction: row; width: 100%; + height: 100%; @media only screen and (max-width: 650px) { position: relative; } @@ -44,6 +45,8 @@ section#content { display: flex; flex-direction: column; padding-right: 1em; + height: 100%; + overflow-y: auto; @media only screen and (max-width: 650px) { position: absolute; float: left; @@ -58,7 +61,7 @@ section#content { } } - ul { + & > ul { flex: 1; width: fit-content; background-color: var(--main-bg-color); @@ -79,12 +82,17 @@ section#content { border-bottom: none; } } + + li.inactive { + font-size: small; + } } main { display: flex; flex-direction: column; flex: 1; + overflow-y: auto; } .icon { From 5866c94535963b235dde32f12e7f0b2e6171a0f6 Mon Sep 17 00:00:00 2001 From: Robert Perce Date: Sat, 4 Apr 2026 22:47:23 -0500 Subject: [PATCH 5/6] fix: manually-freshened-at date overwritten --- Taskfile | 4 ++-- e2e/Taskfile | 10 +--------- e2e/pages/contact.spec.ts | 35 ++++++++++++++++++++++++++++++++--- src/web/contact/mod.rs | 19 ++++++++++++------- 4 files changed, 47 insertions(+), 21 deletions(-) diff --git a/Taskfile b/Taskfile index 9eeaa50..9fa64cf 100755 --- a/Taskfile +++ b/Taskfile @@ -1,11 +1,11 @@ #!/usr/bin/env bash playwright:local() { - bash e2e/Taskfile playwright:local + bash e2e/Taskfile playwright:local "$@" } playwright:ui() { - bash e2e/Taskfile playwright:ui + bash e2e/Taskfile playwright:ui "$@" } refresh_sqlx_db() { diff --git a/e2e/Taskfile b/e2e/Taskfile index 8cb16ea..ee88f38 100755 --- a/e2e/Taskfile +++ b/e2e/Taskfile @@ -10,20 +10,12 @@ playwright:local() { exec docker run \ --interactive --tty --rm --ipc=host --net=host \ --volume "$SCRIPT_DIR":/e2e:rw --env BASE_URL="$BASE_URL" \ - --env ASTRO_TELEMETRY_DISABLED=1 \ "mcr.microsoft.com/playwright:$(_playwright_version)" \ bash -c "cd /e2e && env PROJECT_FILTER=firefox ./Taskfile _test $*" } playwright:ui() { - xhost +local:docker - exec docker run \ - --interactive --tty --rm --ipc=host --net=host\ - --env DISPLAY="$DISPLAY" \ - --volume /tmp/.X11-unix:/tmp/.X11-unix \ - --volume "$SCRIPT_DIR":/e2e:rw --env BASE_URL="$BASE_URL" \ - "mcr.microsoft.com/playwright:$(_playwright_version)" \ - /bin/bash -c "cd /e2e && ./Taskfile _test --ui $*" + playwright:local --ui-host=0.0.0.0 } playwright:ci() { diff --git a/e2e/pages/contact.spec.ts b/e2e/pages/contact.spec.ts index a1e411d..8b4318d 100644 --- a/e2e/pages/contact.spec.ts +++ b/e2e/pages/contact.spec.ts @@ -41,23 +41,52 @@ test('allow marking as inactive', async ({ page }) => { await page.getByRole('link', { name: /edit/i }).click(); await expect(page.locator('#alpine-loaded')).not.toHaveAttribute('x-cloak'); - // TODO: this only works if there's no other comboboxes on the page :/ - await page.getByRole('combobox').selectOption('Inactive') + await page.getByLabel('status').selectOption('Inactive'); await page.getByRole('button', { name: /save/i }).click(); - await expect(page.locator('#alpine-loaded')).not.toHaveAttribute('x-cloak'); await expect(page.locator('#contacts-sidebar').getByText("Test Testerson")).not.toBeVisible(); }); test('allow exempting from stale', async ({ page }) => { + await page.goto('/'); + await expect(page.locator('#freshness')).toContainText('Test Testersonnever'); + await page.locator('#freshness').getByRole('link', { name: /testerson/i }).click(); + await page.getByRole('link', { name: /edit/i }).click(); + await page.getByLabel('status').selectOption('Cannot go stale'); + await page.getByRole('button', { name: /save/i }).click(); + await page.goto('/'); + await expect(page.locator('#freshness')).not.toContainText('Test Testersonnever'); }); test('stale list considers periodicity', async ({ page }) => { + await page.getByRole('link', { name: /edit/i }).click(); + const last_week = (() => { + let last_week = new Date(); + last_week.setDate(last_week.getDate() - 7); + return last_week.toISOString().split("T")[0]; + })(); + await page.getByLabel('freshened').fill(last_week); + await page.getByRole('button', { name: /save/i }).click(); + await expect(page.locator('#journal')).toBeVisible(); + await expect(page.locator('#fields')).toContainText(`freshened${last_week}`); + await page.goto('/'); + await expect(page.locator('#freshness')).toContainText(`Test Testerson${last_week}7d`); + await page.locator('#freshness').getByRole('link', { name: /testerson/i }).click(); + await page.getByRole('link', { name: /edit/i }).click(); + + await page.getByLabel('minimum stale time').fill('2 weeks'); + await page.getByRole('button', { name: /save/i }).click(); + await expect(page.locator('#journal')).toBeVisible(); + + await page.goto('/'); + await expect(page.locator('#freshness')).not.toContainText(`Test Testerson`); }); test('page title has contact primary name', async ({ page }) => { + // wait for page load to finish + await expect(page.locator('#journal')).toBeVisible(); expect(await page.title()).toContain("Test Testerson"); }); diff --git a/src/web/contact/mod.rs b/src/web/contact/mod.rs index 9f4bf8f..7dc487b 100644 --- a/src/web/contact/mod.rs +++ b/src/web/contact/mod.rs @@ -220,12 +220,16 @@ mod get { .await?; let cid_url = format!("/contact/{}", contact.id); - let mfresh_str = contact + let mfresh_on_str = contact .manually_freshened_at .clone() .map_or("".to_string(), |m| { m.to_zoned(TimeZone::UTC).date().to_string() }); + let mfresh_at_str = contact + .manually_freshened_at + .clone() + .map_or("".to_string(), |m| m.to_zoned(TimeZone::UTC).to_string()); let text_body: String = sqlx::query!("select text_body from contacts where id = $1", contact_id) @@ -261,17 +265,17 @@ mod get { input type="button" value="Add" x-on:click="names.push(new_name); new_name = ''"; } } - label { "status" } + label for="status" { "status" } div { - select name="status" x-model=("status") { + select #status name="status" x-model=("status") { option value="normal" { "Normal" } option value="permanent" { "Cannot go stale" } option value="inactive" { "Inactive" } } } - label x-show="status === 'normal'" { "minimum stale time" } + label x-show="status === 'normal'" for="periodicity" { "minimum stale time" } div x-show="status === 'normal'"{ - input name="periodicity" value=(format!("{:#}", contact.periodicity)); + input name="periodicity" id="periodicity" value=(format!("{:#}", contact.periodicity)); span .hint { code { "[0-9]+ (yr|mo|wk|day|h|m|s)" } "(" a href="https://docs.rs/jiff/latest/jiff/struct.Span.html#parsing-and-printing" { "details" } ")" } } label { "birthday" } @@ -279,8 +283,8 @@ mod get { input name="birthday" value=(contact.birthday.clone().map_or("".to_string(), |b| b.serialize())); span .hint { code { "(yyyy|--)mmdd" } " or free text" } } - label { "freshened" } - div x-data=(json!({ "date": mfresh_str, "stamp": "" })) x-init="today = () => (new Date().toISOString().split('T')[0])" { + label for="manually_freshened_on" { "freshened" } + div x-data=(json!({ "date": mfresh_on_str, "stamp": mfresh_at_str })) x-init="today = () => (new Date().toISOString().split('T')[0])" { input type="hidden" name="manually_freshened_at" @@ -288,6 +292,7 @@ mod get { input type="date" name="manually_freshened_on" + id="manually_freshened_on" x-model="date" x-bind:max="today()" x-on:input="stamp = new Date(date).toISOString()"; From 4f141b01c30a4e8e35de6484879d347fac28618c Mon Sep 17 00:00:00 2001 From: Robert Perce Date: Sat, 4 Apr 2026 22:59:39 -0500 Subject: [PATCH 6/6] docs: more README instructions --- README.md | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 90fb9b5..fad7cb6 100644 --- a/README.md +++ b/README.md @@ -11,17 +11,56 @@ I think of when I see "CRM". * Last-contact-time mapping * Address as single field (plus code? lat/long? go crazy!) * Free-text-entry field + * Desired contact periodicity * Journal with Obsidian-like `[[link]]` syntax +* Contact groups (e.g. "Met with `[[Brunch Bunch]]` at the diner") * ical server for birthday reminders +## Explore + +My instance is at https://crm.rperce.net. Username "demo" and password "demo" let +you log into an ephemeral demo user if you want to poke around. + +If you want an account, contact me directly or use the "self-hosting" instructions below. + ## Planned features * Report birthdays and manage add'l fields for contacts stored on a remote CardDAV server * Act as CardDAV server for other clients * For each contact: * Arbitrary add'l yearly dates (e.g. anniversaries) that show on calendar * Relationship mapping - * Desired contact periodicity * Additional arbitrary fields (no special handling) -* Contact groups (e.g. "Met with `[[Brunch Bunch]]` at the diner") * "Named in journal but has no contact entry" detection * Email birthday reminders over SMTP + +--- + +## Development / self-hosting + +1. Clone the repo. +2. Build for your system with `./Taskfile _cargo build --release`. +3. Deploy the binary from `./target/release/mascarpone` to wherever you want that's in PATH + (or use it from here if you want) +4. In the working directory that you want the server to save its databases in, + 1. Create a user for yourself with `mascarpone set-password YOUR_USERNAME`. This will create a `users.db` file. + 2. Run `mkdir dbs`. + 3. Copy the `hashed_static` directory from the code repository. +5. Run `mascarpone serve [port]` from that working directory. The default port is 3000. + If you need to be able to bind to a host other than `0.0.0.0`, contact me directly. + +### Example systemd service file +``` +[Unit] +Description=Mascarpone CRM +After=network.target + +[Service] +Type=simple +WorkingDirectory=/var/local/mascarpone/ +ExecStart=/usr/bin/mascarpone serve +Restart=on-failure +RestartSec=5 + +[Install] +WantedBy=multi-user.target +```