Loading Dockerfile +1 −1 Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="6.2.2" ARG DROP_ACCOUNT_VERSION="2.3.2" RUN sed -i 's/27,1,7,2/27,1,7,2/' ${BASE_DIR}/version.php RUN sed -i 's/27,1,7,3/27,1,7,2/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images Loading patches/024-reminder-service-handle-exception.patch +7 −7 Original line number Diff line number Diff line --- ./apps/dav/lib/CalDAV/Reminder/ReminderService.php 2024-03-15 16:34:18 +++ ./apps/dav/lib/CalDAV/Reminder/ReminderService-new.php 2024-03-15 17:54:05 @@ -44,6 +44,7 @@ --- /Users/ronak/Desktop/murena/git-nextcloud/ecloud_dev_example/volumes/nextcloud/html/apps/dav/lib/CalDAV/Reminder/ReminderService.php 2024-03-15 16:34:18 +++ /Users/ronak/Desktop/murena/git-nextcloud/ecloud_dev_example/volumes/nextcloud/html/apps/dav/lib/CalDAV/Reminder/ReminderService-new.php 2024-03-15 18:11:56 @@ -44,7 +44,7 @@ use Sabre\VObject\ParseException; use Sabre\VObject\Recur\EventIterator; use Sabre\VObject\Recur\NoInstancesException; - +use Sabre\VObject\Recur\MaxInstancesExceededException; class ReminderService { @@ -124,7 +125,13 @@ /** @var Backend */ @@ -124,7 +124,12 @@ continue; } Loading @@ -16,7 +17,6 @@ + try { + $vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']); + } catch (MaxInstancesExceededException $e) { + // $this->logger->debug('Recurrence with too many instances detected, skipping VEVENT', ['exception' => $e]); + $this->backend->removeReminder($reminder['id']); + continue; + } Loading Loading
Dockerfile +1 −1 Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="6.2.2" ARG DROP_ACCOUNT_VERSION="2.3.2" RUN sed -i 's/27,1,7,2/27,1,7,2/' ${BASE_DIR}/version.php RUN sed -i 's/27,1,7,3/27,1,7,2/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images Loading
patches/024-reminder-service-handle-exception.patch +7 −7 Original line number Diff line number Diff line --- ./apps/dav/lib/CalDAV/Reminder/ReminderService.php 2024-03-15 16:34:18 +++ ./apps/dav/lib/CalDAV/Reminder/ReminderService-new.php 2024-03-15 17:54:05 @@ -44,6 +44,7 @@ --- /Users/ronak/Desktop/murena/git-nextcloud/ecloud_dev_example/volumes/nextcloud/html/apps/dav/lib/CalDAV/Reminder/ReminderService.php 2024-03-15 16:34:18 +++ /Users/ronak/Desktop/murena/git-nextcloud/ecloud_dev_example/volumes/nextcloud/html/apps/dav/lib/CalDAV/Reminder/ReminderService-new.php 2024-03-15 18:11:56 @@ -44,7 +44,7 @@ use Sabre\VObject\ParseException; use Sabre\VObject\Recur\EventIterator; use Sabre\VObject\Recur\NoInstancesException; - +use Sabre\VObject\Recur\MaxInstancesExceededException; class ReminderService { @@ -124,7 +125,13 @@ /** @var Backend */ @@ -124,7 +124,12 @@ continue; } Loading @@ -16,7 +17,6 @@ + try { + $vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']); + } catch (MaxInstancesExceededException $e) { + // $this->logger->debug('Recurrence with too many instances detected, skipping VEVENT', ['exception' => $e]); + $this->backend->removeReminder($reminder['id']); + continue; + } Loading