version 0.4.3

Fixes #86

.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}}

.sqlx/query-bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "SELECT *\n                FROM calendars\n                WHERE (principal, id) = (?, ?)",
+  "query": "SELECT *\n                FROM calendars\n                WHERE (principal, id) = (?, ?)\n                AND ((deleted_at IS NULL) OR ?) ",
   "describe": {
     "columns": [
       {
@@ -80,7 +80,7 @@
       }
     ],
     "parameters": {
-      "Right": 2
+      "Right": 3
     },
     "nullable": [
       false,
@@ -100,5 +100,5 @@
       false
     ]
   },
-  "hash": "9f930775043a6d4571a8ffd5a981cadf7c51f3f11a189f8461505abec31076e6"
+  "hash": "bb2fa030f2e7c7afdb38c5c54cb31de5293be332d86cf643977d479999542553"
 }

Cargo.lock

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

Cargo.toml

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

crates/caldav/src/calendar/methods/get.rs

@@ -24,12 +24,16 @@ pub async fn route_get<C: CalendarStore, S: SubscriptionStore>(
         return Err(crate::Error::Unauthorized);
     }
 
-    let calendar = cal_store.get_calendar(&principal, &calendar_id).await?;
+    let calendar = cal_store
+        .get_calendar(&principal, &calendar_id, true)
+        .await?;
     if !user.is_principal(&calendar.principal) {
         return Err(crate::Error::Unauthorized);
     }
 
-    let calendar = cal_store.get_calendar(&principal, &calendar_id).await?;
+    let calendar = cal_store
+        .get_calendar(&principal, &calendar_id, true)
+        .await?;
 
     let mut timezones = HashMap::new();
     let objects = cal_store.get_objects(&principal, &calendar_id).await?;

crates/caldav/src/calendar/methods/post.rs

@@ -25,7 +25,7 @@ pub async fn route_post<C: CalendarStore, S: SubscriptionStore>(
 
     let calendar = resource_service
         .cal_store
-        .get_calendar(&principal, &cal_id)
+        .get_calendar(&principal, &cal_id, false)
         .await?;
     let calendar_resource = CalendarResource {
         cal: calendar,

crates/caldav/src/calendar/service.rs

@@ -56,8 +56,12 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
     async fn get_resource(
         &self,
         (principal, cal_id): &Self::PathComponents,
+        show_deleted: bool,
     ) -> Result<Self::Resource, Error> {
-        let calendar = self.cal_store.get_calendar(principal, cal_id).await?;
+        let calendar = self
+            .cal_store
+            .get_calendar(principal, cal_id, show_deleted)
+            .await?;
         Ok(CalendarResource {
             cal: calendar,
             read_only: self.cal_store.is_read_only(cal_id),

crates/caldav/src/calendar_object/methods.rs

@@ -27,7 +27,9 @@ pub async fn get_event<C: CalendarStore>(
         return Err(crate::Error::Unauthorized);
     }
 
-    let calendar = cal_store.get_calendar(&principal, &calendar_id).await?;
+    let calendar = cal_store
+        .get_calendar(&principal, &calendar_id, false)
+        .await?;
     if !user.is_principal(&calendar.principal) {
         return Err(crate::Error::Unauthorized);
     }

crates/caldav/src/calendar_object/service.rs

@@ -58,10 +58,11 @@ impl<C: CalendarStore> ResourceService for CalendarObjectResourceService<C> {
             calendar_id,
             object_id,
         }: &Self::PathComponents,
+        show_deleted: bool,
     ) -> Result<Self::Resource, Self::Error> {
         let object = self
             .cal_store
-            .get_object(principal, calendar_id, object_id, false)
+            .get_object(principal, calendar_id, object_id, show_deleted)
             .await?;
         Ok(CalendarObjectResource {
             object,

crates/caldav/src/principal/service.rs

@@ -48,6 +48,7 @@ impl<AP: AuthenticationProvider, S: SubscriptionStore, CS: CalendarStore> Resour
     async fn get_resource(
         &self,
         (principal,): &Self::PathComponents,
+        _show_deleted: bool,
     ) -> Result<Self::Resource, Self::Error> {
         let user = self
             .auth_provider

crates/carddav/src/address_object/service.rs

@@ -49,10 +49,11 @@ impl<AS: AddressbookStore> ResourceService for AddressObjectResourceService<AS>
             addressbook_id,
             object_id,
         }: &Self::PathComponents,
+        show_deleted: bool,
     ) -> Result<Self::Resource, Self::Error> {
         let object = self
             .addr_store
-            .get_object(principal, addressbook_id, object_id, false)
+            .get_object(principal, addressbook_id, object_id, show_deleted)
             .await?;
         Ok(AddressObjectResource {
             object,

crates/carddav/src/addressbook/service.rs

@@ -59,10 +59,11 @@ impl<AS: AddressbookStore, S: SubscriptionStore> ResourceService
     async fn get_resource(
         &self,
         (principal, addressbook_id): &Self::PathComponents,
+        show_deleted: bool,
     ) -> Result<Self::Resource, Error> {
         let addressbook = self
             .addr_store
-            .get_addressbook(principal, addressbook_id, false)
+            .get_addressbook(principal, addressbook_id, show_deleted)
             .await
             .map_err(|_e| Error::NotFound)?;
         Ok(addressbook.into())

crates/carddav/src/principal/service.rs

@@ -59,6 +59,7 @@ impl<A: AddressbookStore, AP: AuthenticationProvider, S: SubscriptionStore> Reso
     async fn get_resource(
         &self,
         (principal,): &Self::PathComponents,
+        _show_deleted: bool,
     ) -> Result<Self::Resource, Self::Error> {
         let user = self
             .auth_provider

crates/dav/src/resource/methods/delete.rs

@@ -45,7 +45,7 @@ pub async fn route_delete<R: ResourceService>(
     if_match: Option<IfMatch>,
     if_none_match: Option<IfNoneMatch>,
 ) -> Result<(), R::Error> {
-    let resource = resource_service.get_resource(path_components).await?;
+    let resource = resource_service.get_resource(path_components, true).await?;
 
     // Kind of a bodge since we don't get unbind from the parent
     let privileges = resource.get_user_privileges(principal)?;

crates/dav/src/resource/methods/propfind.rs

@@ -49,7 +49,9 @@ pub(crate) async fn route_propfind<R: ResourceService>(
     resource_service: &R,
     puri: &impl PrincipalUri,
 ) -> Result<RSMultistatus<R>, R::Error> {
-    let resource = resource_service.get_resource(path_components).await?;
+    let resource = resource_service
+        .get_resource(path_components, false)
+        .await?;
     let privileges = resource.get_user_privileges(principal)?;
     if !privileges.has(&UserPrivilege::Read) {
         return Err(Error::Unauthorized.into());

crates/dav/src/resource/methods/proppatch.rs

@@ -85,7 +85,9 @@ pub(crate) async fn route_proppatch<R: ResourceService>(
         operations,
     ) = XmlDocument::parse_str(body).map_err(Error::XmlError)?;
 
-    let mut resource = resource_service.get_resource(path_components).await?;
+    let mut resource = resource_service
+        .get_resource(path_components, false)
+        .await?;
     let privileges = resource.get_user_privileges(principal)?;
     if !privileges.has(&UserPrivilege::Write) {
         return Err(Error::Unauthorized.into());

crates/dav/src/resource/resource_service.rs

@@ -34,7 +34,8 @@ pub trait ResourceService: Clone + Sized + Send + Sync + AxumMethods + 'static {
 
     async fn get_resource(
         &self,
-        _path: &Self::PathComponents,
+        path: &Self::PathComponents,
+        show_deleted: bool,
     ) -> Result<Self::Resource, Self::Error>;
 
     async fn save_resource(

crates/dav/src/resources/root.rs

@@ -86,7 +86,11 @@ where
 
     const DAV_HEADER: &str = "1, 3, access-control";
 
-    async fn get_resource(&self, _: &()) -> Result<Self::Resource, Self::Error> {
+    async fn get_resource(
+        &self,
+        _: &(),
+        _show_deleted: bool,
+    ) -> Result<Self::Resource, Self::Error> {
         Ok(RootResource::<PRS::Resource, P>::default())
     }
 

crates/frontend/src/routes/calendar.rs

@@ -27,7 +27,7 @@ pub async fn route_calendar<C: CalendarStore>(
         return Ok(StatusCode::UNAUTHORIZED.into_response());
     }
     Ok(CalendarPage {
-        calendar: store.get_calendar(&owner, &cal_id).await?,
+        calendar: store.get_calendar(&owner, &cal_id, true).await?,
     }
     .into_response())
 }

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
             )
         );
     }

crates/store/src/calendar_store.rs

@@ -11,7 +11,12 @@ pub struct CalendarQuery {
 
 #[async_trait]
 pub trait CalendarStore: Send + Sync + 'static {
-    async fn get_calendar(&self, principal: &str, id: &str) -> Result<Calendar, Error>;
+    async fn get_calendar(
+        &self,
+        principal: &str,
+        id: &str,
+        show_deleted: bool,
+    ) -> Result<Calendar, Error>;
     async fn get_calendars(&self, principal: &str) -> Result<Vec<Calendar>, Error>;
     async fn get_deleted_calendars(&self, principal: &str) -> Result<Vec<Calendar>, Error>;
 

crates/store/src/combined_calendar_store.rs

@@ -1,8 +1,7 @@
-use std::sync::Arc;
-
 use async_trait::async_trait;
 use derive_more::Constructor;
 use rustical_ical::CalendarObject;
+use std::sync::Arc;
 
 use crate::{
     Calendar, CalendarStore, Error, calendar_store::CalendarQuery,
@@ -27,11 +26,20 @@ impl<CS: CalendarStore, BS: CalendarStore> Clone for CombinedCalendarStore<CS, B
 #[async_trait]
 impl<CS: CalendarStore, BS: CalendarStore> CalendarStore for CombinedCalendarStore<CS, BS> {
     #[inline]
-    async fn get_calendar(&self, principal: &str, id: &str) -> Result<Calendar, Error> {
+    async fn get_calendar(
+        &self,
+        principal: &str,
+        id: &str,
+        show_deleted: bool,
+    ) -> Result<Calendar, Error> {
         if id.starts_with(BIRTHDAYS_PREFIX) {
-            self.birthday_store.get_calendar(principal, id).await
+            self.birthday_store
+                .get_calendar(principal, id, show_deleted)
+                .await
         } else {
-            self.cal_store.get_calendar(principal, id).await
+            self.cal_store
+                .get_calendar(principal, id, show_deleted)
+                .await
         }
     }
 

crates/store/src/contact_birthday_store.rs

@@ -38,11 +38,17 @@ fn birthday_calendar(addressbook: Addressbook) -> Calendar {
 /// Objects are all prefixed with BIRTHDAYS_PREFIX
 #[async_trait]
 impl<AS: AddressbookStore> CalendarStore for ContactBirthdayStore<AS> {
-    async fn get_calendar(&self, principal: &str, id: &str) -> Result<Calendar, Error> {
+    async fn get_calendar(
+        &self,
+        principal: &str,
+        id: &str,
+        show_deleted: bool,
+    ) -> Result<Calendar, Error> {
         let id = id.strip_prefix(BIRTHDAYS_PREFIX).ok_or(Error::NotFound)?;
-        let addressbook = self.0.get_addressbook(principal, id, false).await?;
+        let addressbook = self.0.get_addressbook(principal, id, show_deleted).await?;
         Ok(birthday_calendar(addressbook))
     }
+
     async fn get_calendars(&self, principal: &str) -> Result<Vec<Calendar>, Error> {
         let addressbooks = self.0.get_addressbooks(principal).await?;
         Ok(addressbooks.into_iter().map(birthday_calendar).collect())

crates/store_sqlite/src/calendar_store.rs

@@ -86,14 +86,17 @@ impl SqliteCalendarStore {
         executor: E,
         principal: &str,
         id: &str,
+        show_deleted: bool,
     ) -> Result<Calendar, Error> {
         let cal = sqlx::query_as!(
             CalendarRow,
             r#"SELECT *
                 FROM calendars
-                WHERE (principal, id) = (?, ?)"#,
+                WHERE (principal, id) = (?, ?)
+                AND ((deleted_at IS NULL) OR ?) "#,
             principal,
-            id
+            id,
+            show_deleted
         )
         .fetch_one(executor)
         .await
@@ -470,8 +473,13 @@ impl SqliteCalendarStore {
 #[async_trait]
 impl CalendarStore for SqliteCalendarStore {
     #[instrument]
-    async fn get_calendar(&self, principal: &str, id: &str) -> Result<Calendar, Error> {
-        Self::_get_calendar(&self.db, principal, id).await
+    async fn get_calendar(
+        &self,
+        principal: &str,
+        id: &str,
+        show_deleted: bool,
+    ) -> Result<Calendar, Error> {
+        Self::_get_calendar(&self.db, principal, id, show_deleted).await
     }
 
     #[instrument]
@@ -509,7 +517,7 @@ impl CalendarStore for SqliteCalendarStore {
     ) -> Result<(), Error> {
         let mut tx = self.db.begin().await.map_err(crate::Error::from)?;
 
-        let cal = match Self::_get_calendar(&mut *tx, principal, id).await {
+        let cal = match Self::_get_calendar(&mut *tx, principal, id, true).await {
             Ok(cal) => Some(cal),
             Err(Error::NotFound) => None,
             Err(err) => return Err(err),
@@ -599,7 +607,10 @@ impl CalendarStore for SqliteCalendarStore {
 
         if let Err(err) = self.sender.try_send(CollectionOperation {
             data: CollectionOperationInfo::Content { sync_token },
-            topic: self.get_calendar(&principal, &cal_id).await?.push_topic,
+            topic: self
+                .get_calendar(&principal, &cal_id, true)
+                .await?
+                .push_topic,
         }) {
             error!("Push notification about deleted calendar failed: {err}");
         };
@@ -624,7 +635,7 @@ impl CalendarStore for SqliteCalendarStore {
 
         if let Err(err) = self.sender.try_send(CollectionOperation {
             data: CollectionOperationInfo::Content { sync_token },
-            topic: self.get_calendar(principal, cal_id).await?.push_topic,
+            topic: self.get_calendar(principal, cal_id, true).await?.push_topic,
         }) {
             error!("Push notification about deleted calendar failed: {err}");
         };
@@ -649,7 +660,7 @@ impl CalendarStore for SqliteCalendarStore {
 
         if let Err(err) = self.sender.try_send(CollectionOperation {
             data: CollectionOperationInfo::Content { sync_token },
-            topic: self.get_calendar(principal, cal_id).await?.push_topic,
+            topic: self.get_calendar(principal, cal_id, true).await?.push_topic,
         }) {
             error!("Push notification about deleted calendar failed: {err}");
         };