nextcloud / server

apps/files/templates/list.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 	<?php if (isset($_['dirToken'])):?>
 	<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
 	<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
-	<?php endif;?>
+	<?php endif; ?>
 	<input type="hidden" class="max_human_file_size"
 		   value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
 </div>
@@ -75,6 +75,6 @@ 
 </div>
 <div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
 	<p>
-	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?>
+	<?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.')); ?>
 	</p>
 </div>

apps/dav/templates/schedule-response-success.php

Spacing +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
 ?>
 <div class="guest-box">
 	<div class="icon icon-checkmark"></div>
-	<p class="message"><?php p($l->t('Your attendance was updated successfully.'));?></p>
+	<p class="message"><?php p($l->t('Your attendance was updated successfully.')); ?></p>
 </div>

apps/dav/templates/schedule-response-error.php

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 ?>
 <div class="guest-box">
 	<div class="notecard error">
-		<p><?php p($l->t('There was an error updating your attendance status.'));?></p>
-		<p><?php p($l->t('Please contact the organizer directly.'));?></p>
+		<p><?php p($l->t('There was an error updating your attendance status.')); ?></p>
+		<p><?php p($l->t('Please contact the organizer directly.')); ?></p>
 		<?php if (isset($_['organizer'])): ?>
 			<p><a href="<?php p($_['organizer']) ?>"><?php p(substr($_['organizer'], 7)) ?></a></p>
 		<?php endif; ?>

apps/dav/lib/Migration/Version1024Date20211221144219.php

Indentation +38 added lines, -38 removed lines

@@ -17,42 +17,42 @@
  */
 class Version1024Date20211221144219 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 */
-	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @throws SchemaException
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		$propertiesTable = $schema->getTable('properties');
-
-		if ($propertiesTable->hasColumn('valuetype')) {
-			return null;
-		}
-		$propertiesTable->addColumn('valuetype', Types::SMALLINT, [
-			'notnull' => false,
-			'default' => CustomPropertiesBackend::PROPERTY_TYPE_STRING
-		]);
-
-		return $schema;
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 */
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     */
+    public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+    }
+
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @throws SchemaException
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        $propertiesTable = $schema->getTable('properties');
+
+        if ($propertiesTable->hasColumn('valuetype')) {
+            return null;
+        }
+        $propertiesTable->addColumn('valuetype', Types::SMALLINT, [
+            'notnull' => false,
+            'default' => CustomPropertiesBackend::PROPERTY_TYPE_STRING
+        ]);
+
+        return $schema;
+    }
+
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     */
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+    }
 }

apps/dav/lib/CalDAV/PublicCalendar.php

Indentation +54 added lines, -54 removed lines

@@ -28,63 +28,63 @@
 
 class PublicCalendar extends Calendar {
 
-	/**
-	 * @param string $name
-	 * @throws NotFound
-	 * @return PublicCalendarObject
-	 */
-	public function getChild($name) {
-		$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
+    /**
+     * @param string $name
+     * @throws NotFound
+     * @return PublicCalendarObject
+     */
+    public function getChild($name) {
+        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $name);
 
-		if (!$obj) {
-			throw new NotFound('Calendar object not found');
-		}
-		if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
-			throw new NotFound('Calendar object not found');
-		}
-		$obj['acl'] = $this->getChildACL();
+        if (!$obj) {
+            throw new NotFound('Calendar object not found');
+        }
+        if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
+            throw new NotFound('Calendar object not found');
+        }
+        $obj['acl'] = $this->getChildACL();
 
-		return new PublicCalendarObject($this->caldavBackend, $this->l10n, $this->calendarInfo, $obj);
-	}
+        return new PublicCalendarObject($this->caldavBackend, $this->l10n, $this->calendarInfo, $obj);
+    }
 
-	/**
-	 * @return PublicCalendarObject[]
-	 */
-	public function getChildren() {
-		$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
-		$children = [];
-		foreach ($objs as $obj) {
-			if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
-				continue;
-			}
-			$obj['acl'] = $this->getChildACL();
-			$children[] = new PublicCalendarObject($this->caldavBackend, $this->l10n, $this->calendarInfo, $obj);
-		}
-		return $children;
-	}
+    /**
+     * @return PublicCalendarObject[]
+     */
+    public function getChildren() {
+        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
+        $children = [];
+        foreach ($objs as $obj) {
+            if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
+                continue;
+            }
+            $obj['acl'] = $this->getChildACL();
+            $children[] = new PublicCalendarObject($this->caldavBackend, $this->l10n, $this->calendarInfo, $obj);
+        }
+        return $children;
+    }
 
-	/**
-	 * @param string[] $paths
-	 * @return PublicCalendarObject[]
-	 */
-	public function getMultipleChildren(array $paths) {
-		$objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths);
-		$children = [];
-		foreach ($objs as $obj) {
-			if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
-				continue;
-			}
-			$obj['acl'] = $this->getChildACL();
-			$children[] = new PublicCalendarObject($this->caldavBackend, $this->l10n, $this->calendarInfo, $obj);
-		}
-		return $children;
-	}
+    /**
+     * @param string[] $paths
+     * @return PublicCalendarObject[]
+     */
+    public function getMultipleChildren(array $paths) {
+        $objs = $this->caldavBackend->getMultipleCalendarObjects($this->calendarInfo['id'], $paths);
+        $children = [];
+        foreach ($objs as $obj) {
+            if ($obj['classification'] === CalDavBackend::CLASSIFICATION_PRIVATE) {
+                continue;
+            }
+            $obj['acl'] = $this->getChildACL();
+            $children[] = new PublicCalendarObject($this->caldavBackend, $this->l10n, $this->calendarInfo, $obj);
+        }
+        return $children;
+    }
 
-	/**
-	 * public calendars are always shared
-	 * @return bool
-	 */
-	public function isShared() {
-		return true;
-	}
+    /**
+     * public calendars are always shared
+     * @return bool
+     */
+    public function isShared() {
+        return true;
+    }
 }

apps/dav/lib/CalDAV/Reminder/Notifier.php

Spacing +7 added lines, -7 removed lines

@@ -263,10 +263,10 @@ 
 			]);
 
 			return $localeStart
-				. ' (' . $startTimezone . ') '
+				. ' ('.$startTimezone.') '
 				. ' - '
 				. $localeEnd
-				. ' (' . $endTimezone . ')';
+				. ' ('.$endTimezone.')';
 		}
 
 		// Show only the time if the day is the same
@@ -280,7 +280,7 @@ 
 		return $localeStart
 			. ' - '
 			. $localeEnd
-			. ' (' . $startTimezone . ')';
+			. ' ('.$startTimezone.')';
 	}
 
 	/**
@@ -298,7 +298,7 @@ 
 	 * @return string
 	 */
 	private function getWeekDayName(DateTime $dt):string {
-		return (string)$this->l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
+		return (string) $this->l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
 	}
 
 	/**
@@ -306,7 +306,7 @@ 
 	 * @return string
 	 */
 	private function getDateString(DateTime $dt):string {
-		return (string)$this->l10n->l('date', $dt, ['width' => 'medium']);
+		return (string) $this->l10n->l('date', $dt, ['width' => 'medium']);
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	 * @return string
 	 */
 	private function getDateTimeString(DateTime $dt):string {
-		return (string)$this->l10n->l('datetime', $dt, ['width' => 'medium|short']);
+		return (string) $this->l10n->l('datetime', $dt, ['width' => 'medium|short']);
 	}
 
 	/**
@@ -322,6 +322,6 @@ 
 	 * @return string
 	 */
 	private function getTimeString(DateTime $dt):string {
-		return (string)$this->l10n->l('time', $dt, ['width' => 'short']);
+		return (string) $this->l10n->l('time', $dt, ['width' => 'short']);
 	}
 }

Indentation +282 added lines, -282 removed lines

@@ -26,286 +26,286 @@
  */
 class Notifier implements INotifier {
 
-	/** @var IL10N */
-	private $l10n;
-
-	/**
-	 * Notifier constructor.
-	 *
-	 * @param IFactory $l10nFactory
-	 * @param IURLGenerator $urlGenerator
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(
-		private IFactory $l10nFactory,
-		private IURLGenerator $urlGenerator,
-		private ITimeFactory $timeFactory,
-	) {
-	}
-
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID():string {
-		return Application::APP_ID;
-	}
-
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName():string {
-		return $this->l10nFactory->get('dav')->t('Calendar');
-	}
-
-	/**
-	 * Prepare sending the notification
-	 *
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws UnknownNotificationException
-	 */
-	public function prepare(INotification $notification,
-		string $languageCode):INotification {
-		if ($notification->getApp() !== Application::APP_ID) {
-			throw new UnknownNotificationException('Notification not from this app');
-		}
-
-		// Read the language from the notification
-		$this->l10n = $this->l10nFactory->get('dav', $languageCode);
-
-		// Handle notifier subjects
-		switch ($notification->getSubject()) {
-			case 'calendar_reminder':
-				return $this->prepareReminderNotification($notification);
-
-			default:
-				throw new UnknownNotificationException('Unknown subject');
-
-		}
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @return INotification
-	 */
-	private function prepareReminderNotification(INotification $notification):INotification {
-		$imagePath = $this->urlGenerator->imagePath('core', 'places/calendar.svg');
-		$iconUrl = $this->urlGenerator->getAbsoluteURL($imagePath);
-		$notification->setIcon($iconUrl);
-
-		$this->prepareNotificationSubject($notification);
-		$this->prepareNotificationMessage($notification);
-
-		return $notification;
-	}
-
-	/**
-	 * Sets the notification subject based on the parameters set in PushProvider
-	 *
-	 * @param INotification $notification
-	 */
-	private function prepareNotificationSubject(INotification $notification): void {
-		$parameters = $notification->getSubjectParameters();
-
-		$startTime = \DateTime::createFromFormat(\DateTimeInterface::ATOM, $parameters['start_atom']);
-		$now = $this->timeFactory->getDateTime();
-		$title = $this->getTitleFromParameters($parameters);
-
-		$diff = $startTime->diff($now);
-		if ($diff === false) {
-			return;
-		}
-
-		$components = [];
-		if ($diff->y) {
-			$components[] = $this->l10n->n('%n year', '%n years', $diff->y);
-		}
-		if ($diff->m) {
-			$components[] = $this->l10n->n('%n month', '%n months', $diff->m);
-		}
-		if ($diff->d) {
-			$components[] = $this->l10n->n('%n day', '%n days', $diff->d);
-		}
-		if ($diff->h) {
-			$components[] = $this->l10n->n('%n hour', '%n hours', $diff->h);
-		}
-		if ($diff->i) {
-			$components[] = $this->l10n->n('%n minute', '%n minutes', $diff->i);
-		}
-
-		if (count($components) > 0 && !$this->hasPhpDatetimeDiffBug()) {
-			// Limiting to the first three components to prevent
-			// the string from getting too long
-			$firstThreeComponents = array_slice($components, 0, 2);
-			$diffLabel = implode(', ', $firstThreeComponents);
-
-			if ($diff->invert) {
-				$title = $this->l10n->t('%s (in %s)', [$title, $diffLabel]);
-			} else {
-				$title = $this->l10n->t('%s (%s ago)', [$title, $diffLabel]);
-			}
-		}
-
-		$notification->setParsedSubject($title);
-	}
-
-	/**
-	 * @see https://github.com/nextcloud/server/issues/41615
-	 * @see https://github.com/php/php-src/issues/9699
-	 */
-	private function hasPhpDatetimeDiffBug(): bool {
-		$d1 = DateTime::createFromFormat(\DateTimeInterface::ATOM, '2023-11-22T11:52:00+01:00');
-		$d2 = new DateTime('2023-11-22T10:52:03', new \DateTimeZone('UTC'));
-
-		// The difference is 3 seconds, not -1year+11months+…
-		return $d1->diff($d2)->y < 0;
-	}
-
-	/**
-	 * Sets the notification message based on the parameters set in PushProvider
-	 *
-	 * @param INotification $notification
-	 */
-	private function prepareNotificationMessage(INotification $notification): void {
-		$parameters = $notification->getMessageParameters();
-
-		$description = [
-			$this->l10n->t('Calendar: %s', $parameters['calendar_displayname']),
-			$this->l10n->t('Date: %s', $this->generateDateString($parameters)),
-		];
-		if ($parameters['description']) {
-			$description[] = $this->l10n->t('Description: %s', $parameters['description']);
-		}
-		if ($parameters['location']) {
-			$description[] = $this->l10n->t('Where: %s', $parameters['location']);
-		}
-
-		$message = implode("\r\n", $description);
-		$notification->setParsedMessage($message);
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return string
-	 */
-	private function getTitleFromParameters(array $parameters):string {
-		return $parameters['title'] ?? $this->l10n->t('Untitled event');
-	}
-
-	/**
-	 * @param array $parameters
-	 * @return string
-	 * @throws \Exception
-	 */
-	private function generateDateString(array $parameters):string {
-		$startDateTime = DateTime::createFromFormat(\DateTimeInterface::ATOM, $parameters['start_atom']);
-		$endDateTime = DateTime::createFromFormat(\DateTimeInterface::ATOM, $parameters['end_atom']);
-
-		// If the event has already ended, dismiss the notification
-		if ($endDateTime < $this->timeFactory->getDateTime()) {
-			throw new AlreadyProcessedException();
-		}
-
-		$isAllDay = $parameters['all_day'];
-		$diff = $startDateTime->diff($endDateTime);
-
-		if ($isAllDay) {
-			// One day event
-			if ($diff->days === 1) {
-				return $this->getDateString($startDateTime);
-			}
-
-			return implode(' - ', [
-				$this->getDateString($startDateTime),
-				$this->getDateString($endDateTime),
-			]);
-		}
-
-		$startTimezone = $endTimezone = null;
-		if (!$parameters['start_is_floating']) {
-			$startTimezone = $parameters['start_timezone'];
-			$endTimezone = $parameters['end_timezone'];
-		}
-
-		$localeStart = implode(', ', [
-			$this->getWeekDayName($startDateTime),
-			$this->getDateTimeString($startDateTime)
-		]);
-
-		// always show full date with timezone if timezones are different
-		if ($startTimezone !== $endTimezone) {
-			$localeEnd = implode(', ', [
-				$this->getWeekDayName($endDateTime),
-				$this->getDateTimeString($endDateTime)
-			]);
-
-			return $localeStart
-				. ' (' . $startTimezone . ') '
-				. ' - '
-				. $localeEnd
-				. ' (' . $endTimezone . ')';
-		}
-
-		// Show only the time if the day is the same
-		$localeEnd = $this->isDayEqual($startDateTime, $endDateTime)
-			? $this->getTimeString($endDateTime)
-			: implode(', ', [
-				$this->getWeekDayName($endDateTime),
-				$this->getDateTimeString($endDateTime)
-			]);
-
-		return $localeStart
-			. ' - '
-			. $localeEnd
-			. ' (' . $startTimezone . ')';
-	}
-
-	/**
-	 * @param DateTime $dtStart
-	 * @param DateTime $dtEnd
-	 * @return bool
-	 */
-	private function isDayEqual(DateTime $dtStart,
-		DateTime $dtEnd):bool {
-		return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
-	}
-
-	/**
-	 * @param DateTime $dt
-	 * @return string
-	 */
-	private function getWeekDayName(DateTime $dt):string {
-		return (string)$this->l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
-	}
-
-	/**
-	 * @param DateTime $dt
-	 * @return string
-	 */
-	private function getDateString(DateTime $dt):string {
-		return (string)$this->l10n->l('date', $dt, ['width' => 'medium']);
-	}
-
-	/**
-	 * @param DateTime $dt
-	 * @return string
-	 */
-	private function getDateTimeString(DateTime $dt):string {
-		return (string)$this->l10n->l('datetime', $dt, ['width' => 'medium|short']);
-	}
-
-	/**
-	 * @param DateTime $dt
-	 * @return string
-	 */
-	private function getTimeString(DateTime $dt):string {
-		return (string)$this->l10n->l('time', $dt, ['width' => 'short']);
-	}
+    /** @var IL10N */
+    private $l10n;
+
+    /**
+     * Notifier constructor.
+     *
+     * @param IFactory $l10nFactory
+     * @param IURLGenerator $urlGenerator
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(
+        private IFactory $l10nFactory,
+        private IURLGenerator $urlGenerator,
+        private ITimeFactory $timeFactory,
+    ) {
+    }
+
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID():string {
+        return Application::APP_ID;
+    }
+
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName():string {
+        return $this->l10nFactory->get('dav')->t('Calendar');
+    }
+
+    /**
+     * Prepare sending the notification
+     *
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws UnknownNotificationException
+     */
+    public function prepare(INotification $notification,
+        string $languageCode):INotification {
+        if ($notification->getApp() !== Application::APP_ID) {
+            throw new UnknownNotificationException('Notification not from this app');
+        }
+
+        // Read the language from the notification
+        $this->l10n = $this->l10nFactory->get('dav', $languageCode);
+
+        // Handle notifier subjects
+        switch ($notification->getSubject()) {
+            case 'calendar_reminder':
+                return $this->prepareReminderNotification($notification);
+
+            default:
+                throw new UnknownNotificationException('Unknown subject');
+
+        }
+    }
+
+    /**
+     * @param INotification $notification
+     * @return INotification
+     */
+    private function prepareReminderNotification(INotification $notification):INotification {
+        $imagePath = $this->urlGenerator->imagePath('core', 'places/calendar.svg');
+        $iconUrl = $this->urlGenerator->getAbsoluteURL($imagePath);
+        $notification->setIcon($iconUrl);
+
+        $this->prepareNotificationSubject($notification);
+        $this->prepareNotificationMessage($notification);
+
+        return $notification;
+    }
+
+    /**
+     * Sets the notification subject based on the parameters set in PushProvider
+     *
+     * @param INotification $notification
+     */
+    private function prepareNotificationSubject(INotification $notification): void {
+        $parameters = $notification->getSubjectParameters();
+
+        $startTime = \DateTime::createFromFormat(\DateTimeInterface::ATOM, $parameters['start_atom']);
+        $now = $this->timeFactory->getDateTime();
+        $title = $this->getTitleFromParameters($parameters);
+
+        $diff = $startTime->diff($now);
+        if ($diff === false) {
+            return;
+        }
+
+        $components = [];
+        if ($diff->y) {
+            $components[] = $this->l10n->n('%n year', '%n years', $diff->y);
+        }
+        if ($diff->m) {
+            $components[] = $this->l10n->n('%n month', '%n months', $diff->m);
+        }
+        if ($diff->d) {
+            $components[] = $this->l10n->n('%n day', '%n days', $diff->d);
+        }
+        if ($diff->h) {
+            $components[] = $this->l10n->n('%n hour', '%n hours', $diff->h);
+        }
+        if ($diff->i) {
+            $components[] = $this->l10n->n('%n minute', '%n minutes', $diff->i);
+        }
+
+        if (count($components) > 0 && !$this->hasPhpDatetimeDiffBug()) {
+            // Limiting to the first three components to prevent
+            // the string from getting too long
+            $firstThreeComponents = array_slice($components, 0, 2);
+            $diffLabel = implode(', ', $firstThreeComponents);
+
+            if ($diff->invert) {
+                $title = $this->l10n->t('%s (in %s)', [$title, $diffLabel]);
+            } else {
+                $title = $this->l10n->t('%s (%s ago)', [$title, $diffLabel]);
+            }
+        }
+
+        $notification->setParsedSubject($title);
+    }
+
+    /**
+     * @see https://github.com/nextcloud/server/issues/41615
+     * @see https://github.com/php/php-src/issues/9699
+     */
+    private function hasPhpDatetimeDiffBug(): bool {
+        $d1 = DateTime::createFromFormat(\DateTimeInterface::ATOM, '2023-11-22T11:52:00+01:00');
+        $d2 = new DateTime('2023-11-22T10:52:03', new \DateTimeZone('UTC'));
+
+        // The difference is 3 seconds, not -1year+11months+…
+        return $d1->diff($d2)->y < 0;
+    }
+
+    /**
+     * Sets the notification message based on the parameters set in PushProvider
+     *
+     * @param INotification $notification
+     */
+    private function prepareNotificationMessage(INotification $notification): void {
+        $parameters = $notification->getMessageParameters();
+
+        $description = [
+            $this->l10n->t('Calendar: %s', $parameters['calendar_displayname']),
+            $this->l10n->t('Date: %s', $this->generateDateString($parameters)),
+        ];
+        if ($parameters['description']) {
+            $description[] = $this->l10n->t('Description: %s', $parameters['description']);
+        }
+        if ($parameters['location']) {
+            $description[] = $this->l10n->t('Where: %s', $parameters['location']);
+        }
+
+        $message = implode("\r\n", $description);
+        $notification->setParsedMessage($message);
+    }
+
+    /**
+     * @param array $parameters
+     * @return string
+     */
+    private function getTitleFromParameters(array $parameters):string {
+        return $parameters['title'] ?? $this->l10n->t('Untitled event');
+    }
+
+    /**
+     * @param array $parameters
+     * @return string
+     * @throws \Exception
+     */
+    private function generateDateString(array $parameters):string {
+        $startDateTime = DateTime::createFromFormat(\DateTimeInterface::ATOM, $parameters['start_atom']);
+        $endDateTime = DateTime::createFromFormat(\DateTimeInterface::ATOM, $parameters['end_atom']);
+
+        // If the event has already ended, dismiss the notification
+        if ($endDateTime < $this->timeFactory->getDateTime()) {
+            throw new AlreadyProcessedException();
+        }
+
+        $isAllDay = $parameters['all_day'];
+        $diff = $startDateTime->diff($endDateTime);
+
+        if ($isAllDay) {
+            // One day event
+            if ($diff->days === 1) {
+                return $this->getDateString($startDateTime);
+            }
+
+            return implode(' - ', [
+                $this->getDateString($startDateTime),
+                $this->getDateString($endDateTime),
+            ]);
+        }
+
+        $startTimezone = $endTimezone = null;
+        if (!$parameters['start_is_floating']) {
+            $startTimezone = $parameters['start_timezone'];
+            $endTimezone = $parameters['end_timezone'];
+        }
+
+        $localeStart = implode(', ', [
+            $this->getWeekDayName($startDateTime),
+            $this->getDateTimeString($startDateTime)
+        ]);
+
+        // always show full date with timezone if timezones are different
+        if ($startTimezone !== $endTimezone) {
+            $localeEnd = implode(', ', [
+                $this->getWeekDayName($endDateTime),
+                $this->getDateTimeString($endDateTime)
+            ]);
+
+            return $localeStart
+                . ' (' . $startTimezone . ') '
+                . ' - '
+                . $localeEnd
+                . ' (' . $endTimezone . ')';
+        }
+
+        // Show only the time if the day is the same
+        $localeEnd = $this->isDayEqual($startDateTime, $endDateTime)
+            ? $this->getTimeString($endDateTime)
+            : implode(', ', [
+                $this->getWeekDayName($endDateTime),
+                $this->getDateTimeString($endDateTime)
+            ]);
+
+        return $localeStart
+            . ' - '
+            . $localeEnd
+            . ' (' . $startTimezone . ')';
+    }
+
+    /**
+     * @param DateTime $dtStart
+     * @param DateTime $dtEnd
+     * @return bool
+     */
+    private function isDayEqual(DateTime $dtStart,
+        DateTime $dtEnd):bool {
+        return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
+    }
+
+    /**
+     * @param DateTime $dt
+     * @return string
+     */
+    private function getWeekDayName(DateTime $dt):string {
+        return (string)$this->l10n->l('weekdayName', $dt, ['width' => 'abbreviated']);
+    }
+
+    /**
+     * @param DateTime $dt
+     * @return string
+     */
+    private function getDateString(DateTime $dt):string {
+        return (string)$this->l10n->l('date', $dt, ['width' => 'medium']);
+    }
+
+    /**
+     * @param DateTime $dt
+     * @return string
+     */
+    private function getDateTimeString(DateTime $dt):string {
+        return (string)$this->l10n->l('datetime', $dt, ['width' => 'medium|short']);
+    }
+
+    /**
+     * @param DateTime $dt
+     * @return string
+     */
+    private function getTimeString(DateTime $dt):string {
+        return (string)$this->l10n->l('time', $dt, ['width' => 'short']);
+    }
 }

apps/dav/lib/Listener/ActivityUpdaterListener.php

Spacing +13 added lines, -13 removed lines

@@ -70,7 +70,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar creation, so we just log it
-				$this->logger->error('Error generating activities for a new calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a new calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -87,7 +87,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar update, so we just log it
-				$this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for changed calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -103,7 +103,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar update, so we just log it
-				$this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for changed calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -119,13 +119,13 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar update, so we just log it
-				$this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for changed calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
 		} elseif ($event instanceof CalendarDeletedEvent) {
 			try {
-				$deletedProp = '{' . Plugin::NS_NEXTCLOUD . '}deleted-at';
+				$deletedProp = '{'.Plugin::NS_NEXTCLOUD.'}deleted-at';
 				if (isset($event->getCalendarData()[$deletedProp])) {
 					$this->logger->debug(
 						sprintf('Calendar %d was already in trashbin, skipping deletion activity', $event->getCalendarId())
@@ -142,7 +142,7 @@ 
 				}
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a deleted calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -160,7 +160,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar object creation, so we just log it
-				$this->logger->error('Error generating activity for a new calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activity for a new calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -178,7 +178,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activity for a deleted calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -197,7 +197,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activity for a deleted calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -215,7 +215,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar object creation, so we just log it
-				$this->logger->error('Error generating activity for a new calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activity for a new calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -233,13 +233,13 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar object restoration, so we just log it
-				$this->logger->error('Error generating activity for a restored calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activity for a restored calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
 		} elseif ($event instanceof CalendarObjectDeletedEvent) {
 			try {
-				$deletedProp = '{' . Plugin::NS_NEXTCLOUD . '}deleted-at';
+				$deletedProp = '{'.Plugin::NS_NEXTCLOUD.'}deleted-at';
 				if (isset($event->getObjectData()[$deletedProp])) {
 					$this->logger->debug(
 						sprintf('Calendar object in calendar %d was already in trashbin, skipping deletion activity', $event->getCalendarId())
@@ -258,7 +258,7 @@ 
 				}
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activity for a deleted calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}

Indentation +212 added lines, -212 removed lines

@@ -30,216 +30,216 @@
 /** @template-implements IEventListener<CalendarCreatedEvent|CalendarUpdatedEvent|CalendarMovedToTrashEvent|CalendarRestoredEvent|CalendarDeletedEvent|CalendarObjectCreatedEvent|CalendarObjectUpdatedEvent|CalendarObjectMovedEvent|CalendarObjectMovedToTrashEvent|CalendarObjectRestoredEvent|CalendarObjectDeletedEvent> */
 class ActivityUpdaterListener implements IEventListener {
 
-	public function __construct(
-		private ActivityBackend $activityBackend,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	public function handle(Event $event): void {
-		if ($event instanceof CalendarCreatedEvent) {
-			try {
-				$this->activityBackend->onCalendarAdd(
-					$event->getCalendarData()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for new calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar creation, so we just log it
-				$this->logger->error('Error generating activities for a new calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarUpdatedEvent) {
-			try {
-				$this->activityBackend->onCalendarUpdate(
-					$event->getCalendarData(),
-					$event->getShares(),
-					$event->getMutations()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for changed calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar update, so we just log it
-				$this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarMovedToTrashEvent) {
-			try {
-				$this->activityBackend->onCalendarMovedToTrash(
-					$event->getCalendarData(),
-					$event->getShares()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for changed calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar update, so we just log it
-				$this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarRestoredEvent) {
-			try {
-				$this->activityBackend->onCalendarRestored(
-					$event->getCalendarData(),
-					$event->getShares()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for changed calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar update, so we just log it
-				$this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarDeletedEvent) {
-			try {
-				$deletedProp = '{' . Plugin::NS_NEXTCLOUD . '}deleted-at';
-				if (isset($event->getCalendarData()[$deletedProp])) {
-					$this->logger->debug(
-						sprintf('Calendar %d was already in trashbin, skipping deletion activity', $event->getCalendarId())
-					);
-				} else {
-					$this->activityBackend->onCalendarDelete(
-						$event->getCalendarData(),
-						$event->getShares()
-					);
-
-					$this->logger->debug(
-						sprintf('Activity generated for deleted calendar %d', $event->getCalendarId())
-					);
-				}
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectCreatedEvent) {
-			try {
-				$this->activityBackend->onTouchCalendarObject(
-					\OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_ADD,
-					$event->getCalendarData(),
-					$event->getShares(),
-					$event->getObjectData()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for new calendar object in calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar object creation, so we just log it
-				$this->logger->error('Error generating activity for a new calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectUpdatedEvent) {
-			try {
-				$this->activityBackend->onTouchCalendarObject(
-					\OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_UPDATE,
-					$event->getCalendarData(),
-					$event->getShares(),
-					$event->getObjectData()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for updated calendar object in calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectMovedEvent) {
-			try {
-				$this->activityBackend->onMovedCalendarObject(
-					$event->getSourceCalendarData(),
-					$event->getTargetCalendarData(),
-					$event->getSourceShares(),
-					$event->getTargetShares(),
-					$event->getObjectData()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for moved calendar object from calendar %d to calendar %d', $event->getSourceCalendarId(), $event->getTargetCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectMovedToTrashEvent) {
-			try {
-				$this->activityBackend->onTouchCalendarObject(
-					\OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_MOVE_TO_TRASH,
-					$event->getCalendarData(),
-					$event->getShares(),
-					$event->getObjectData()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for a calendar object of calendar %d that is moved to trash', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar object creation, so we just log it
-				$this->logger->error('Error generating activity for a new calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectRestoredEvent) {
-			try {
-				$this->activityBackend->onTouchCalendarObject(
-					\OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_RESTORE,
-					$event->getCalendarData(),
-					$event->getShares(),
-					$event->getObjectData()
-				);
-
-				$this->logger->debug(
-					sprintf('Activity generated for a restore calendar object of calendar %d', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar object restoration, so we just log it
-				$this->logger->error('Error generating activity for a restored calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectDeletedEvent) {
-			try {
-				$deletedProp = '{' . Plugin::NS_NEXTCLOUD . '}deleted-at';
-				if (isset($event->getObjectData()[$deletedProp])) {
-					$this->logger->debug(
-						sprintf('Calendar object in calendar %d was already in trashbin, skipping deletion activity', $event->getCalendarId())
-					);
-				} else {
-					$this->activityBackend->onTouchCalendarObject(
-						\OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_DELETE,
-						$event->getCalendarData(),
-						$event->getShares(),
-						$event->getObjectData()
-					);
-
-					$this->logger->debug(
-						sprintf('Activity generated for deleted calendar object in calendar %d', $event->getCalendarId())
-					);
-				}
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
+    public function __construct(
+        private ActivityBackend $activityBackend,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    public function handle(Event $event): void {
+        if ($event instanceof CalendarCreatedEvent) {
+            try {
+                $this->activityBackend->onCalendarAdd(
+                    $event->getCalendarData()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for new calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar creation, so we just log it
+                $this->logger->error('Error generating activities for a new calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarUpdatedEvent) {
+            try {
+                $this->activityBackend->onCalendarUpdate(
+                    $event->getCalendarData(),
+                    $event->getShares(),
+                    $event->getMutations()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for changed calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar update, so we just log it
+                $this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarMovedToTrashEvent) {
+            try {
+                $this->activityBackend->onCalendarMovedToTrash(
+                    $event->getCalendarData(),
+                    $event->getShares()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for changed calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar update, so we just log it
+                $this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarRestoredEvent) {
+            try {
+                $this->activityBackend->onCalendarRestored(
+                    $event->getCalendarData(),
+                    $event->getShares()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for changed calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar update, so we just log it
+                $this->logger->error('Error generating activities for changed calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarDeletedEvent) {
+            try {
+                $deletedProp = '{' . Plugin::NS_NEXTCLOUD . '}deleted-at';
+                if (isset($event->getCalendarData()[$deletedProp])) {
+                    $this->logger->debug(
+                        sprintf('Calendar %d was already in trashbin, skipping deletion activity', $event->getCalendarId())
+                    );
+                } else {
+                    $this->activityBackend->onCalendarDelete(
+                        $event->getCalendarData(),
+                        $event->getShares()
+                    );
+
+                    $this->logger->debug(
+                        sprintf('Activity generated for deleted calendar %d', $event->getCalendarId())
+                    );
+                }
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar deletion, so we just log it
+                $this->logger->error('Error generating activities for a deleted calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectCreatedEvent) {
+            try {
+                $this->activityBackend->onTouchCalendarObject(
+                    \OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_ADD,
+                    $event->getCalendarData(),
+                    $event->getShares(),
+                    $event->getObjectData()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for new calendar object in calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar object creation, so we just log it
+                $this->logger->error('Error generating activity for a new calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectUpdatedEvent) {
+            try {
+                $this->activityBackend->onTouchCalendarObject(
+                    \OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_UPDATE,
+                    $event->getCalendarData(),
+                    $event->getShares(),
+                    $event->getObjectData()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for updated calendar object in calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar deletion, so we just log it
+                $this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectMovedEvent) {
+            try {
+                $this->activityBackend->onMovedCalendarObject(
+                    $event->getSourceCalendarData(),
+                    $event->getTargetCalendarData(),
+                    $event->getSourceShares(),
+                    $event->getTargetShares(),
+                    $event->getObjectData()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for moved calendar object from calendar %d to calendar %d', $event->getSourceCalendarId(), $event->getTargetCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar deletion, so we just log it
+                $this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectMovedToTrashEvent) {
+            try {
+                $this->activityBackend->onTouchCalendarObject(
+                    \OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_MOVE_TO_TRASH,
+                    $event->getCalendarData(),
+                    $event->getShares(),
+                    $event->getObjectData()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for a calendar object of calendar %d that is moved to trash', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar object creation, so we just log it
+                $this->logger->error('Error generating activity for a new calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectRestoredEvent) {
+            try {
+                $this->activityBackend->onTouchCalendarObject(
+                    \OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_RESTORE,
+                    $event->getCalendarData(),
+                    $event->getShares(),
+                    $event->getObjectData()
+                );
+
+                $this->logger->debug(
+                    sprintf('Activity generated for a restore calendar object of calendar %d', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar object restoration, so we just log it
+                $this->logger->error('Error generating activity for a restored calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectDeletedEvent) {
+            try {
+                $deletedProp = '{' . Plugin::NS_NEXTCLOUD . '}deleted-at';
+                if (isset($event->getObjectData()[$deletedProp])) {
+                    $this->logger->debug(
+                        sprintf('Calendar object in calendar %d was already in trashbin, skipping deletion activity', $event->getCalendarId())
+                    );
+                } else {
+                    $this->activityBackend->onTouchCalendarObject(
+                        \OCA\DAV\CalDAV\Activity\Provider\Event::SUBJECT_OBJECT_DELETE,
+                        $event->getCalendarData(),
+                        $event->getShares(),
+                        $event->getObjectData()
+                    );
+
+                    $this->logger->debug(
+                        sprintf('Activity generated for deleted calendar object in calendar %d', $event->getCalendarId())
+                    );
+                }
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar deletion, so we just log it
+                $this->logger->error('Error generating activity for a deleted calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
 }

apps/dav/lib/Listener/SubscriptionListener.php

Spacing +6 added lines, -6 removed lines

@@ -57,13 +57,13 @@ 
 			$subscriptionId = $event->getSubscriptionId();
 			$subscriptionData = $event->getSubscriptionData();
 
-			$this->logger->debug('Refreshing webcal data for subscription ' . $subscriptionId);
+			$this->logger->debug('Refreshing webcal data for subscription '.$subscriptionId);
 			$this->refreshWebcalService->refreshSubscription(
-				(string)$subscriptionData['principaluri'],
-				(string)$subscriptionData['uri']
+				(string) $subscriptionData['principaluri'],
+				(string) $subscriptionData['uri']
 			);
 
-			$this->logger->debug('Scheduling webcal data refreshment for subscription ' . $subscriptionId);
+			$this->logger->debug('Scheduling webcal data refreshment for subscription '.$subscriptionId);
 			$this->jobList->add(RefreshWebcalJob::class, [
 				'principaluri' => $subscriptionData['principaluri'],
 				'uri' => $subscriptionData['uri']
@@ -72,13 +72,13 @@ 
 			$subscriptionId = $event->getSubscriptionId();
 			$subscriptionData = $event->getSubscriptionData();
 
-			$this->logger->debug('Removing refresh webcal job for subscription ' . $subscriptionId);
+			$this->logger->debug('Removing refresh webcal job for subscription '.$subscriptionId);
 			$this->jobList->remove(RefreshWebcalJob::class, [
 				'principaluri' => $subscriptionData['principaluri'],
 				'uri' => $subscriptionData['uri']
 			]);
 
-			$this->logger->debug('Cleaning all reminders for subscription ' . $subscriptionId);
+			$this->logger->debug('Cleaning all reminders for subscription '.$subscriptionId);
 			$this->reminderBackend->cleanRemindersForCalendar($subscriptionId);
 		}
 	}

Indentation +36 added lines, -36 removed lines

@@ -20,45 +20,45 @@
 
 /** @template-implements IEventListener<SubscriptionCreatedEvent|SubscriptionDeletedEvent> */
 class SubscriptionListener implements IEventListener {
-	public function __construct(
-		private IJobList $jobList,
-		private RefreshWebcalService $refreshWebcalService,
-		private ReminderBackend $reminderBackend,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private IJobList $jobList,
+        private RefreshWebcalService $refreshWebcalService,
+        private ReminderBackend $reminderBackend,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	/**
-	 * In case the user has set their default calendar to the deleted one
-	 */
-	public function handle(Event $event): void {
-		if ($event instanceof SubscriptionCreatedEvent) {
-			$subscriptionId = $event->getSubscriptionId();
-			$subscriptionData = $event->getSubscriptionData();
+    /**
+     * In case the user has set their default calendar to the deleted one
+     */
+    public function handle(Event $event): void {
+        if ($event instanceof SubscriptionCreatedEvent) {
+            $subscriptionId = $event->getSubscriptionId();
+            $subscriptionData = $event->getSubscriptionData();
 
-			$this->logger->debug('Refreshing webcal data for subscription ' . $subscriptionId);
-			$this->refreshWebcalService->refreshSubscription(
-				(string)$subscriptionData['principaluri'],
-				(string)$subscriptionData['uri']
-			);
+            $this->logger->debug('Refreshing webcal data for subscription ' . $subscriptionId);
+            $this->refreshWebcalService->refreshSubscription(
+                (string)$subscriptionData['principaluri'],
+                (string)$subscriptionData['uri']
+            );
 
-			$this->logger->debug('Scheduling webcal data refreshment for subscription ' . $subscriptionId);
-			$this->jobList->add(RefreshWebcalJob::class, [
-				'principaluri' => $subscriptionData['principaluri'],
-				'uri' => $subscriptionData['uri']
-			]);
-		} elseif ($event instanceof SubscriptionDeletedEvent) {
-			$subscriptionId = $event->getSubscriptionId();
-			$subscriptionData = $event->getSubscriptionData();
+            $this->logger->debug('Scheduling webcal data refreshment for subscription ' . $subscriptionId);
+            $this->jobList->add(RefreshWebcalJob::class, [
+                'principaluri' => $subscriptionData['principaluri'],
+                'uri' => $subscriptionData['uri']
+            ]);
+        } elseif ($event instanceof SubscriptionDeletedEvent) {
+            $subscriptionId = $event->getSubscriptionId();
+            $subscriptionData = $event->getSubscriptionData();
 
-			$this->logger->debug('Removing refresh webcal job for subscription ' . $subscriptionId);
-			$this->jobList->remove(RefreshWebcalJob::class, [
-				'principaluri' => $subscriptionData['principaluri'],
-				'uri' => $subscriptionData['uri']
-			]);
+            $this->logger->debug('Removing refresh webcal job for subscription ' . $subscriptionId);
+            $this->jobList->remove(RefreshWebcalJob::class, [
+                'principaluri' => $subscriptionData['principaluri'],
+                'uri' => $subscriptionData['uri']
+            ]);
 
-			$this->logger->debug('Cleaning all reminders for subscription ' . $subscriptionId);
-			$this->reminderBackend->cleanRemindersForCalendar($subscriptionId);
-		}
-	}
+            $this->logger->debug('Cleaning all reminders for subscription ' . $subscriptionId);
+            $this->reminderBackend->cleanRemindersForCalendar($subscriptionId);
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php

Indentation +47 added lines, -47 removed lines

@@ -35,56 +35,56 @@
  * or mangle Etag headers.
  */
 class CopyEtagHeaderPlugin extends \Sabre\DAV\ServerPlugin {
-	private ?Server $server = null;
+    private ?Server $server = null;
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server Sabre server
-	 *
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
+    /**
+     * This initializes the plugin.
+     *
+     * @param \Sabre\DAV\Server $server Sabre server
+     *
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
 
-		$server->on('afterMethod:*', [$this, 'afterMethod']);
-		$server->on('afterMove', [$this, 'afterMove']);
-	}
+        $server->on('afterMethod:*', [$this, 'afterMethod']);
+        $server->on('afterMove', [$this, 'afterMove']);
+    }
 
-	/**
-	 * After method, copy the "Etag" header to "OC-Etag" header.
-	 *
-	 * @param RequestInterface $request request
-	 * @param ResponseInterface $response response
-	 */
-	public function afterMethod(RequestInterface $request, ResponseInterface $response) {
-		$eTag = $response->getHeader('Etag');
-		if (!empty($eTag)) {
-			$response->setHeader('OC-ETag', $eTag);
-		}
-	}
+    /**
+     * After method, copy the "Etag" header to "OC-Etag" header.
+     *
+     * @param RequestInterface $request request
+     * @param ResponseInterface $response response
+     */
+    public function afterMethod(RequestInterface $request, ResponseInterface $response) {
+        $eTag = $response->getHeader('Etag');
+        if (!empty($eTag)) {
+            $response->setHeader('OC-ETag', $eTag);
+        }
+    }
 
-	/**
-	 * Called after a node is moved.
-	 *
-	 * This allows the backend to move all the associated properties.
-	 *
-	 * @param string $source
-	 * @param string $destination
-	 * @return void
-	 */
-	public function afterMove($source, $destination) {
-		try {
-			$node = $this->server->tree->getNodeForPath($destination);
-		} catch (NotFound $e) {
-			// Don't care
-			return;
-		}
+    /**
+     * Called after a node is moved.
+     *
+     * This allows the backend to move all the associated properties.
+     *
+     * @param string $source
+     * @param string $destination
+     * @return void
+     */
+    public function afterMove($source, $destination) {
+        try {
+            $node = $this->server->tree->getNodeForPath($destination);
+        } catch (NotFound $e) {
+            // Don't care
+            return;
+        }
 
-		if ($node instanceof File) {
-			$eTag = $node->getETag();
-			$this->server->httpResponse->setHeader('OC-ETag', $eTag);
-			$this->server->httpResponse->setHeader('ETag', $eTag);
-		}
-	}
+        if ($node instanceof File) {
+            $eTag = $node->getETag();
+            $this->server->httpResponse->setHeader('OC-ETag', $eTag);
+            $this->server->httpResponse->setHeader('ETag', $eTag);
+        }
+    }
 }