fix: add VTIMEZONE to Appointments

Signed-off-by: Anna Larch <anna@nextcloud.com>
nextcloud · Jun 27, 2023 · ee68d75 · ee68d75
1 parent fd591c6
commit ee68d75
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/lib/Service/Appointments/BookingCalendarWriter.php b/lib/Service/Appointments/BookingCalendarWriter.php
@@ -93,7 +93,7 @@ private function secondsToIso8601Duration(int $secs): string {
 	 * @return string
 	 * @throws RuntimeException
 	 */
-	public function write(AppointmentConfig $config, DateTimeImmutable $start, string $displayName, string $email, ?string $description = null) : string {
+	public function write(AppointmentConfig $config, DateTimeImmutable $start, string $displayName, string $email, string $timezone, ?string $description = null) : string {
 		$calendar = current($this->manager->getCalendarsForPrincipal($config->getPrincipalUri(), [$config->getTargetCalendarUri()]));
 		if (!($calendar instanceof ICreateFromString)) {
 			throw new RuntimeException('Could not find a public writable calendar for this principal');
@@ -113,7 +113,10 @@ public function write(AppointmentConfig $config, DateTimeImmutable $start, strin
 				'STATUS' => 'CONFIRMED',
 				'DTSTART' => $start,
 				'DTEND' => $start->setTimestamp($start->getTimestamp() + ($config->getLength()))
-			]
+			],
+			'VTIMEZONE' => [
+				'TZID' => $timezone
+			],
 		]);
 
 		if (!empty($description)) {
@@ -191,7 +194,10 @@ public function write(AppointmentConfig $config, DateTimeImmutable $start, strin
 					'STATUS' => 'CONFIRMED',
 					'DTSTART' => $prepStart,
 					'DTEND' => $start
-				]
+				],
+				'VTIMEZONE' => [
+					'TZID' => $timezone
+				],
 			]);
 
 			$prepCalendar->VEVENT->add('RELATED-TO', $vcalendar->VEVENT->{'UID'});
@@ -219,7 +225,10 @@ public function write(AppointmentConfig $config, DateTimeImmutable $start, strin
 					'STATUS' => 'CONFIRMED',
 					'DTSTART' => $followupStart,
 					'DTEND' => $followUpEnd
-				]
+				],
+				'VTIMEZONE' => [
+					'TZID' => $timezone
+				],
 			]);
 
 			$followUpCalendar->VEVENT->add('RELATED-TO', $vcalendar->VEVENT->{'UID'});

diff --git a/lib/Service/Appointments/BookingService.php b/lib/Service/Appointments/BookingService.php
@@ -111,7 +111,7 @@ public function confirmBooking(Booking $booking, AppointmentConfig $config): Boo
 			throw new ClientException('Could not make sense of booking times');
 		}
 
-		$calendar = $this->calendarWriter->write($config, $startObj, $booking->getDisplayName(), $booking->getEmail(), $booking->getDescription());
+		$calendar = $this->calendarWriter->write($config, $startObj, $booking->getDisplayName(), $booking->getEmail(), $booking->getTimezone(), $booking->getDescription());
 		$booking->setConfirmed(true);
 		$this->bookingMapper->update($booking);