From 96f221f721e36b1e27d4d69ea59b62b5d84ccd61 Mon Sep 17 00:00:00 2001 From: Lennart <18233294+lennart-k@users.noreply.github.com> Date: Sat, 22 Nov 2025 18:32:53 +0100 Subject: [PATCH] birthday_calendar: Refactor insert_birthday_calendar --- Cargo.lock | 1 + .../store_sqlite/src/addressbook_store/birthday_calendar.rs | 5 +++-- crates/store_sqlite/src/addressbook_store/mod.rs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d3e5a0..b834b0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3230,6 +3230,7 @@ dependencies = [ "rustical_store_sqlite", "rustical_xml", "serde", + "sha2", "thiserror 2.0.17", "tokio", "tower", diff --git a/crates/store_sqlite/src/addressbook_store/birthday_calendar.rs b/crates/store_sqlite/src/addressbook_store/birthday_calendar.rs index 3c310c8..5043e14 100644 --- a/crates/store_sqlite/src/addressbook_store/birthday_calendar.rs +++ b/crates/store_sqlite/src/addressbook_store/birthday_calendar.rs @@ -118,15 +118,16 @@ impl SqliteAddressbookStore { #[instrument] pub async fn _insert_birthday_calendar<'e, E: Executor<'e, Database = Sqlite>>( executor: E, - addressbook: Addressbook, + addressbook: &Addressbook, ) -> Result<(), rustical_store::Error> { let birthday_name = addressbook .displayname + .as_ref() .map(|name| format!("{name} birthdays")); let birthday_push_topic = { let mut hasher = Sha256::new(); hasher.update("birthdays"); - hasher.update(addressbook.push_topic); + hasher.update(&addressbook.push_topic); format!("{:x}", hasher.finalize()) }; diff --git a/crates/store_sqlite/src/addressbook_store/mod.rs b/crates/store_sqlite/src/addressbook_store/mod.rs index 56a9c90..8d755d6 100644 --- a/crates/store_sqlite/src/addressbook_store/mod.rs +++ b/crates/store_sqlite/src/addressbook_store/mod.rs @@ -467,7 +467,7 @@ impl AddressbookStore for SqliteAddressbookStore { .await .map_err(crate::Error::from)?; Self::_insert_addressbook(&mut *tx, &addressbook).await?; - Self::_insert_birthday_calendar(&mut *tx, addressbook).await?; + Self::_insert_birthday_calendar(&mut *tx, &addressbook).await?; tx.commit().await.map_err(crate::Error::from)?; Ok(()) }