delete birthday calendar events permanently

Signed-off-by: Maximilian Martin <[email protected]>
nextcloud · Feb 4, 2022 · cfd0950 · cfd0950
1 parent 43932a9
commit cfd0950
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php
@@ -150,7 +150,7 @@ public function onCardDeleted(int $addressBookId,
 			$calendar = $this->ensureCalendarExists($principalUri);
 			foreach (['', '-death', '-anniversary'] as $tag) {
 				$objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
-				$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
+				$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri, CalDavBackend::CALENDAR_TYPE_CALENDAR, true);
 			}
 		}
 	}
@@ -306,7 +306,7 @@ public function resetForUser(string $user):void {
 		$calendarObjects = $this->calDavBackEnd->getCalendarObjects($calendar['id'], CalDavBackend::CALENDAR_TYPE_CALENDAR);
 
 		foreach ($calendarObjects as $calendarObject) {
-			$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $calendarObject['uri'], CalDavBackend::CALENDAR_TYPE_CALENDAR);
+			$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $calendarObject['uri'], CalDavBackend::CALENDAR_TYPE_CALENDAR, true);
 		}
 	}
 
@@ -384,7 +384,7 @@ private function updateCalendar(string $cardUri,
 		$existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
 		if ($calendarData === null) {
 			if ($existing !== null) {
-				$this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri);
+				$this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri, CalDavBackend::CALENDAR_TYPE_CALENDAR, true);
 			}
 		} else {
 			if ($existing === null) {
@@ -398,7 +398,7 @@ private function updateCalendar(string $cardUri,
 					if ($existing2path !== null && array_key_exists('uri', $calendarInfo)) {
 						// delete the old birthday entry first so that we do not get duplicate UIDs
 						$existing2objectUri = substr($existing2path, strlen($calendarInfo['uri']) + 1);
-						$this->calDavBackEnd->deleteCalendarObject($calendarId, $existing2objectUri);
+						$this->calDavBackEnd->deleteCalendarObject($calendarId, $existing2objectUri, CalDavBackend::CALENDAR_TYPE_CALENDAR, true);
 					}
 				}