version 0.4.2

Fixes #79

.github/workflows/docker-publish.yml

@@ -41,12 +41,10 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          # As long as we don't have releases everything on the main branch shall be tagged as latest
           tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
             type=ref,event=branch
             type=ref,event=pr
             type=semver,pattern={{version}}

Cargo.lock

@@ -2736,7 +2736,7 @@ dependencies = [
 
 [[package]]
 name = "rustical"
-version = "0.3.6"
+version = "0.4.2"
 dependencies = [
  "anyhow",
  "argon2",
@@ -2779,7 +2779,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_caldav"
-version = "0.3.6"
+version = "0.4.2"
 dependencies = [
  "async-trait",
  "axum",
@@ -2814,7 +2814,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_carddav"
-version = "0.3.6"
+version = "0.4.2"
 dependencies = [
  "async-trait",
  "axum",
@@ -2846,7 +2846,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav"
-version = "0.3.6"
+version = "0.4.2"
 dependencies = [
  "async-trait",
  "axum",
@@ -2871,7 +2871,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_dav_push"
-version = "0.3.6"
+version = "0.4.2"
 dependencies = [
  "async-trait",
  "axum",
@@ -2897,7 +2897,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_frontend"
-version = "0.3.6"
+version = "0.4.2"
 dependencies = [
  "askama",
  "askama_web",
@@ -2930,7 +2930,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_ical"
-version = "0.3.6"
+version = "0.4.2"
 dependencies = [
  "axum",
  "chrono",
@@ -2948,7 +2948,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_oidc"
-version = "0.3.6"
+version = "0.4.2"
 dependencies = [
  "async-trait",
  "axum",
@@ -2963,7 +2963,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_store"
-version = "0.3.6"
+version = "0.4.2"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2997,7 +2997,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_store_sqlite"
-version = "0.3.6"
+version = "0.4.2"
 dependencies = [
  "async-trait",
  "chrono",
@@ -3017,7 +3017,7 @@ dependencies = [
 
 [[package]]
 name = "rustical_xml"
-version = "0.3.6"
+version = "0.4.2"
 dependencies = [
  "quick-xml",
  "thiserror 2.0.12",

Cargo.toml

@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.3.6"
+version = "0.4.2"
 edition = "2024"
 description = "A CalDAV server"
 repository = "https://github.com/lennart-k/rustical"

crates/frontend/src/config.rs

@@ -12,3 +12,12 @@ pub struct FrontendConfig {
     #[serde(default = "default_true")]
     pub allow_password_login: bool,
 }
+
+impl Default for FrontendConfig {
+    fn default() -> Self {
+        Self {
+            enabled: true,
+            allow_password_login: true,
+        }
+    }
+}

crates/ical/src/address_object.rs

@@ -62,14 +62,14 @@ impl AddressObject {
         &self.vcf
     }
 
-    pub fn get_anniversary(&self) -> Option<CalDateTime> {
-        let prop = self.vcard.get_property("ANNIVERSARY")?;
-        CalDateTime::parse_prop(prop, &HashMap::default()).ok()
+    pub fn get_anniversary(&self) -> Option<(CalDateTime, bool)> {
+        let prop = self.vcard.get_property("ANNIVERSARY")?.value.as_deref()?;
+        CalDateTime::parse_vcard(prop).ok()
     }
 
-    pub fn get_birthday(&self) -> Option<CalDateTime> {
-        let prop = self.vcard.get_property("BDAY")?;
-        CalDateTime::parse_prop(prop, &HashMap::default()).ok()
+    pub fn get_birthday(&self) -> Option<(CalDateTime, bool)> {
+        let prop = self.vcard.get_property("BDAY")?.value.as_deref()?;
+        CalDateTime::parse_vcard(prop).ok()
     }
 
     pub fn get_full_name(&self) -> Option<&str> {
@@ -78,25 +78,27 @@ impl AddressObject {
     }
 
     pub fn get_anniversary_object(&self) -> Result<Option<CalendarObject>, Error> {
-        Ok(if let Some(anniversary) = self.get_anniversary() {
-            let fullname = if let Some(name) = self.get_full_name() {
-                name
-            } else {
-                return Ok(None);
-            };
-            let anniversary = anniversary.date();
-            let year = anniversary.year();
-            let anniversary_start = anniversary.format(LOCAL_DATE);
-            let anniversary_end = anniversary
-                .succ_opt()
-                .unwrap_or(anniversary)
-                .format(LOCAL_DATE);
-            let uid = format!("{}-anniversary", self.get_id());
+        Ok(
+            if let Some((anniversary, contains_year)) = self.get_anniversary() {
+                let fullname = if let Some(name) = self.get_full_name() {
+                    name
+                } else {
+                    return Ok(None);
+                };
+                let anniversary = anniversary.date();
+                let year = contains_year.then_some(anniversary.year());
+                let anniversary_start = anniversary.format(LOCAL_DATE);
+                let anniversary_end = anniversary
+                    .succ_opt()
+                    .unwrap_or(anniversary)
+                    .format(LOCAL_DATE);
+                let uid = format!("{}-anniversary", self.get_id());
 
-            Some(CalendarObject::from_ics(
-                uid.clone(),
-                format!(
-                    r#"BEGIN:VCALENDAR
+                let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
+                Some(CalendarObject::from_ics(
+                    uid.clone(),
+                    format!(
+                        r#"BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
 PRODID:-//github.com/lennart-k/rustical birthday calendar//EN
@@ -105,39 +107,42 @@ DTSTART;VALUE=DATE:{anniversary_start}
 DTEND;VALUE=DATE:{anniversary_end}
 UID:{uid}
 RRULE:FREQ=YEARLY
-SUMMARY:💍 {fullname} ({year})
+SUMMARY:💍 {fullname}{year_suffix}
 TRANSP:TRANSPARENT
 BEGIN:VALARM
 TRIGGER;VALUE=DURATION:-PT0M
 ACTION:DISPLAY
-DESCRIPTION:💍 {fullname} ({year})
+DESCRIPTION:💍 {fullname}{year_suffix}
 END:VALARM
 END:VEVENT
 END:VCALENDAR"#,
-                ),
-            )?)
-        } else {
-            None
-        })
+                    ),
+                )?)
+            } else {
+                None
+            },
+        )
     }
 
     pub fn get_birthday_object(&self) -> Result<Option<CalendarObject>, Error> {
-        Ok(if let Some(birthday) = self.get_birthday() {
-            let fullname = if let Some(name) = self.get_full_name() {
-                name
-            } else {
-                return Ok(None);
-            };
-            let birthday = birthday.date();
-            let year = birthday.year();
-            let birthday_start = birthday.format(LOCAL_DATE);
-            let birthday_end = birthday.succ_opt().unwrap_or(birthday).format(LOCAL_DATE);
-            let uid = format!("{}-birthday", self.get_id());
+        Ok(
+            if let Some((birthday, contains_year)) = self.get_birthday() {
+                let fullname = if let Some(name) = self.get_full_name() {
+                    name
+                } else {
+                    return Ok(None);
+                };
+                let birthday = birthday.date();
+                let year = contains_year.then_some(birthday.year());
+                let birthday_start = birthday.format(LOCAL_DATE);
+                let birthday_end = birthday.succ_opt().unwrap_or(birthday).format(LOCAL_DATE);
+                let uid = format!("{}-birthday", self.get_id());
 
-            Some(CalendarObject::from_ics(
-                uid.clone(),
-                format!(
-                    r#"BEGIN:VCALENDAR
+                let year_suffix = year.map(|year| format!(" ({year})")).unwrap_or_default();
+                Some(CalendarObject::from_ics(
+                    uid.clone(),
+                    format!(
+                        r#"BEGIN:VCALENDAR
 VERSION:2.0
 CALSCALE:GREGORIAN
 PRODID:-//github.com/lennart-k/rustical birthday calendar//EN
@@ -146,20 +151,21 @@ DTSTART;VALUE=DATE:{birthday_start}
 DTEND;VALUE=DATE:{birthday_end}
 UID:{uid}
 RRULE:FREQ=YEARLY
-SUMMARY:🎂 {fullname} ({year})
+SUMMARY:🎂 {fullname}{year_suffix}
 TRANSP:TRANSPARENT
 BEGIN:VALARM
 TRIGGER;VALUE=DURATION:-PT0M
 ACTION:DISPLAY
-DESCRIPTION:🎂 {fullname} ({year})
+DESCRIPTION:🎂 {fullname}{year_suffix}
 END:VALARM
 END:VEVENT
 END:VCALENDAR"#,
-                ),
-            )?)
-        } else {
-            None
-        })
+                    ),
+                )?)
+            } else {
+                None
+            },
+        )
     }
 
     /// Get significant dates associated with this address object

crates/ical/src/timestamp.rs

@@ -254,6 +254,16 @@ impl CalDateTime {
         if let Ok(date) = NaiveDate::parse_from_str(value, "%Y%m%d") {
             return Ok(CalDateTime::Date(date, timezone));
         }
+
+        Err(CalDateTimeError::InvalidDatetimeFormat(value.to_string()))
+    }
+
+    // Also returns whether the date contains a year
+    pub fn parse_vcard(value: &str) -> Result<(Self, bool), CalDateTimeError> {
+        if let Ok(datetime) = Self::parse(value, None) {
+            return Ok((datetime, true));
+        }
+
         if let Some(captures) = RE_VCARD_DATE_MM_DD.captures(value) {
             // Because 1972 is a leap year
             let year = 1972;
@@ -261,13 +271,15 @@ impl CalDateTime {
             let month = captures.name("m").unwrap().as_str().parse().ok().unwrap();
             let day = captures.name("d").unwrap().as_str().parse().ok().unwrap();
 
-            return Ok(CalDateTime::Date(
-                NaiveDate::from_ymd_opt(year, month, day)
-                    .ok_or(CalDateTimeError::ParseError(value.to_string()))?,
-                timezone,
+            return Ok((
+                CalDateTime::Date(
+                    NaiveDate::from_ymd_opt(year, month, day)
+                        .ok_or(CalDateTimeError::ParseError(value.to_string()))?,
+                    CalTimezone::Local,
+                ),
+                false,
             ));
         }
-
         Err(CalDateTimeError::InvalidDatetimeFormat(value.to_string()))
     }
 
@@ -407,24 +419,33 @@ mod tests {
     #[test]
     fn test_vcard_date() {
         assert_eq!(
-            CalDateTime::parse("19850412", None).unwrap(),
-            CalDateTime::Date(
-                NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
-                crate::CalTimezone::Local
+            CalDateTime::parse_vcard("19850412").unwrap(),
+            (
+                CalDateTime::Date(
+                    NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
+                    crate::CalTimezone::Local
+                ),
+                true
             )
         );
         assert_eq!(
-            CalDateTime::parse("1985-04-12", None).unwrap(),
-            CalDateTime::Date(
-                NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
-                crate::CalTimezone::Local
+            CalDateTime::parse_vcard("1985-04-12").unwrap(),
+            (
+                CalDateTime::Date(
+                    NaiveDate::from_ymd_opt(1985, 4, 12).unwrap(),
+                    crate::CalTimezone::Local
+                ),
+                true
             )
         );
         assert_eq!(
-            CalDateTime::parse("--0412", None).unwrap(),
-            CalDateTime::Date(
-                NaiveDate::from_ymd_opt(1972, 4, 12).unwrap(),
-                crate::CalTimezone::Local
+            CalDateTime::parse_vcard("--0412").unwrap(),
+            (
+                CalDateTime::Date(
+                    NaiveDate::from_ymd_opt(1972, 4, 12).unwrap(),
+                    crate::CalTimezone::Local
+                ),
+                false
             )
         );
     }

src/config.rs

@@ -79,6 +79,7 @@ pub struct Config {
     pub data_store: DataStoreConfig,
     #[serde(default)]
     pub http: HttpConfig,
+    #[serde(default)]
     pub frontend: FrontendConfig,
     #[serde(default)]
     pub oidc: Option<OidcConfig>,